svn commit: r831920 - in /ofbiz/trunk/applications/accounting: webapp/accounting/WEB-INF/ webapp/ap/WEB-INF/ webapp/ar/WEB-INF/ widget/ widget/ap/ widget/ar/

[apatel-2]

Author: apatel
Date: Mon Nov  2 15:32:39 2009
New Revision: 831920

URL: http://svn.apache.org/viewvc?rev=831920&view=rev
Log:
Removed duplicate definition of CommonPartyDecorator. Added partyDecoratorLocation parameter to ar/ap web.xml file so they can find CommonPartyDecorator.
This issues was discussed on list after r829392 commit in response to patch on OFBIZ-3080.
 

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml
    ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml
    ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml
    ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlScreens.xml
    ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
    ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
    ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml?rev=831920&r1=831919&r2=831920&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml Mon Nov  2 15:32:39 2009
@@ -49,6 +49,11 @@
         <param-value>component://accounting/widget/CommonScreens.xml</param-value>
         <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
     </context-param>
+    <context-param>
+        <param-name>partyDecoratorLocation</param-name>
+        <param-value>component://accounting/widget/CommonScreens.xml</param-value>
+        <description>The location of the CommonPartyDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+    </context-param>
 
     <filter>
         <filter-name>ContextFilter</filter-name>

Modified: ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml?rev=831920&r1=831919&r2=831920&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml Mon Nov  2 15:32:39 2009
@@ -45,6 +45,11 @@
         <param-value>component://accounting/widget/ap/CommonScreens.xml</param-value>
         <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
     </context-param>
+    <context-param>
+        <param-name>partyDecoratorLocation</param-name>
+        <param-value>component://accounting/widget/CommonScreens.xml</param-value>
+        <description>The location of the CommonPartyDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+    </context-param>
 
     <filter>
         <filter-name>ContextFilter</filter-name>

Modified: ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml?rev=831920&r1=831919&r2=831920&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml Mon Nov  2 15:32:39 2009
@@ -49,6 +49,11 @@
         <param-value>component://accounting/widget/ar/CommonScreens.xml</param-value>
         <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
     </context-param>
+    <context-param>
+        <param-name>partyDecoratorLocation</param-name>
+        <param-value>component://accounting/widget/CommonScreens.xml</param-value>
+        <description>The location of the CommonPartyDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
+    </context-param>
 
     <filter>
         <filter-name>ContextFilter</filter-name>

Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=831920&r1=831919&r2=831920&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Mon Nov  2 15:32:39 2009
@@ -138,7 +138,7 @@
                 </entity-one>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyDecorator" location="${parameters.partyDecoratorLocation}">
                     <decorator-section name="body">
                         <include-menu name="OrganizationAccountingTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
                         <include-menu name="OrganizationAccountingReportsTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
@@ -161,7 +161,7 @@
                 </entity-one>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyDecorator" location="${parameters.partyDecoratorLocation}">
                     <decorator-section name="body">
                         <include-menu name="OrganizationAccountingTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
                         <include-menu name="PartyAccountingChecksTabBar" location="component://accounting/widget/AccountingMenus.xml"/>

Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=831920&r1=831919&r2=831920&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Mon Nov  2 15:32:39 2009
@@ -30,7 +30,7 @@
                 </entity-one>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyDecorator" location="${parameters.partyDecoratorLocation}">
                     <decorator-section name="body">
                         <include-menu name="OrganizationAccountingTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
                         <container>

Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=831920&r1=831919&r2=831920&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Mon Nov  2 15:32:39 2009
@@ -30,7 +30,7 @@
                 </entity-one>
             </actions>
             <widgets>
-                <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="CommonPartyDecorator" location="${parameters.partyDecoratorLocation}">
                     <decorator-section name="body">
                         <include-menu name="PartyAdminTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
                         <section>

Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=831920&r1=831919&r2=831920&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Mon Nov  2 15:32:39 2009
@@ -344,27 +344,4 @@
             </widgets>
         </section>
     </screen>
-    <screen name="CommonPartyDecorator">
-        <section>
-            <actions>
-                <set field="headerItem" value="companies"/>
-                <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <condition>
-                                <not><if-empty field="organizationPartyId"/></not>
-                            </condition>
-                            <widgets>
-                                <include-menu name="PartyTopTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
 </screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=831920&r1=831919&r2=831920&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Mon Nov  2 15:32:39 2009
@@ -178,28 +178,5 @@
             </widgets>
         </section>
     </screen>
-    <screen name="CommonPartyDecorator">
-        <section>
-            <actions>
-                <set field="headerItem" value="companies"/>
-                <set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <condition>
-                                <not><if-empty field="organizationPartyId"/></not>
-                            </condition>
-                            <widgets>
-                                <include-menu name="PartyTopTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
 
 </screens>
\ No newline at end of file