OFBiz › OFBiz - Commits

svn commit: r818363 [2/2] - in /ofbiz/trunk: applications/commonext/config/ applications/commonext/data/ applications/commonext/data/helpdata/ applications/commonext/documents/ applications/commonext/script/ applications/commonext/script/org/ofbiz/setu...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

hansbak-2

svn commit: r818363 [2/2] - in /ofbiz/trunk: applications/commonext/config/ applications/commonext/data/ applications/commonext/data/helpdata/ applications/commonext/documents/ applications/commonext/script/ applications/commonext/script/org/ofbiz/setu...

Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/SetupScreens.xml Thu Sep 24 04:08:38 2009
@@ -96,13 +96,19 @@
</condition>
<widgets>
<section>
- <actions>
- <script location="component://product/webapp/facility/WEB-INF/actions/facility/EditFacility.groovy"/>
- </actions>
+ <condition>
+ <not><if-empty field="facility"/></not>
+ </condition>
<widgets>
- <platform-specific>
- <html><html-template location="component://commonext/webapp/ofbizsetup/organization/EditFacility.ftl"/></html>
- </platform-specific>
+ <label style="h1" text="${uiLabelMap.ProductEditFacility} ${facility.facilityName} [${facility.facilityId}]"></label>
+ </widgets>
+ <fail-widgets>
+ <label style="h1" text="${uiLabelMap.ProductNewFacility}"></label>
+ </fail-widgets>
+ </section>
+ <section>
+ <widgets>
+ <include-form name="EditFacility" location="component://commonext/widget/ofbizsetup/SetupForms.xml"/>
</widgets>
</section>
</widgets>
@@ -121,7 +127,7 @@
<actions>
<set field="titleProperty" value="PageTitleEditProductStore"/>
<set field="tabButtonItemTop" value="productstore"/>
- <set field="labelTitleProperty" value="ProductStore"/>
+ <set field="labelTitleProperty" value="PageTitleEditProductStore"/>

<set field="partyId" from-field="parameters.partyId"/>
<entity-one entity-name="PartyGroup" value-field="partyGroup"/>
@@ -141,7 +147,7 @@
<condition><not><if-empty field="productStoreId"/></not></condition>
<widgets>
<container>
- <label style="h1" text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${uiLabelMap.${extraFunctionName}}"/>
+ <label style="h1" text="${uiLabelMap.PageTitleEditProductStore} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}]"/>
</container>
</widgets>
</section>
@@ -184,9 +190,7 @@
<set field="titleProperty" value="PageTitleEditWebSite"/>
<set field="tabButtonItemTop" value="website"/>
<set field="labelTitleProperty" value="PageTitleEditWebSite"/>
-
<set field="partyId" from-field="parameters.partyId"/>
- <set field="webSiteId" from-field="parameters.webSiteId"/>
<script location="component://commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy"/>
</actions>
<widgets>
@@ -198,10 +202,10 @@
</condition>
<widgets>
<section>
- <condition><not><if-empty field="webSiteId"/></not></condition>
+ <condition><not><if-empty field="webSite"/></not></condition>
<widgets>
<container>
- <label style="h1" text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}: ${webSite.siteName} [${webSite.webSiteId}] ${uiLabelMap.${extraFunctionName}}"/>
+ <label style="h1" text="${uiLabelMap.PageTitleEditWebSite} ${uiLabelMap.CommonFor}: ${webSite.siteName} [${webSite.webSiteId}]"/>
</container>
</widgets>
</section>
@@ -381,4 +385,20 @@
</widgets>
</section>
</screen>
+
+ <screen name="nopartyAcctgPreference">
+ <section>
+ <actions>
+ <set field="titleProperty" value="SetupCreateNewOrganization"/>
+ <set field="headerItem" value="init"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <label style="errorMessage">${uiLabelMap.SetupEventMessage}</label>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
\ No newline at end of file

Modified: ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl Thu Sep 24 04:08:38 2009
@@ -50,7 +50,7 @@
<#--li><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li-->
<#-- Show OFBiz Setup component menu bar when the system not have an organization -->
<#if thisApp.equals("/ofbizsetup")>
- <#if organizationList.size() == 0>
+ <#if PartyAcctgPrefAndGroupList.size() == 0>
<li><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
</#if>
<#else>

Modified: ofbiz/trunk/themes/bluelight/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbar.ftl?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/appbar.ftl Thu Sep 24 04:08:38 2009
@@ -53,7 +53,7 @@
<#--li><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li-->
<#-- Show OFBiz Setup component menu bar when the system not have an organization -->
<#if thisApp.equals("/ofbizsetup")>
- <#if organizationList.size() == 0>
+ <#if PartyAcctgPrefAndGroupList.size() == 0>
<li><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
</#if>
<#else>

Modified: ofbiz/trunk/themes/flatgrey/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/appbar.ftl?rev=818363&r1=818362&r2=818363&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/appbar.ftl Thu Sep 24 04:08:38 2009
@@ -47,7 +47,7 @@
</#if>
<#-- Show OFBiz Setup component menu bar when the system not have an organization -->
<#if thisApp.equals("/ofbizsetup")>
- <#if organizationList.size() == 0>
+ <#if PartyAcctgPrefAndGroupList.size() == 0>
<li<#if selected> class="selected"</#if>><a href="${thisURL}${externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
</#if>
<#else>