svn commit: r948019 - in /ofbiz/branches/release10.04: ./ applications/accounting/widget/AccountingTrees.xml applications/accounting/widget/GlobalGlAccountsScreens.xml

Author: jleroux
Date: Tue May 25 12:15:14 2010
New Revision: 948019

URL: http://svn.apache.org/viewvc?rev=948019&view=rev
Log:
"Applied fix from trunk for revision: 948017"
------------------------------------------------------------------------
r948017 | jleroux | 2010-05-25 14:08:24 +0200 (mar. 25 mai 2010) | 8 lignes

A patch from Ankit Jain "Edit/Navigate Global GL Account - Found URL parameter [glAccountId] passed to secure (https) request-map with uri [updateGlAccount]" (https://issues.apache.org/jira/browse/OFBIZ-3316) - OFBIZ-3316

The error can be reproduced as following:

Steps:
1) Go to Accounting > Global GL Settings > Select any value(100000) from the list > in the "Edit GL Account" update the record > now in the "Navigate Accounts" section click on any node .

Then you will get the error .......
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/accounting/widget/AccountingTrees.xml
    ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsScreens.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 25 12:15:14 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017

Modified: ofbiz/branches/release10.04/applications/accounting/widget/AccountingTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/AccountingTrees.xml?rev=948019&r1=948018&r2=948019&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/accounting/widget/AccountingTrees.xml (original)
+++ ofbiz/branches/release10.04/applications/accounting/widget/AccountingTrees.xml Tue May 25 12:15:14 2010
@@ -20,7 +20,30 @@ under the License.
 
 <trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-tree.xsd">
-    <tree name="GlAccountTree" entity-name="GlAccount" root-node-name="node-root" default-render-style="expand-collapse" default-wrap-style="accountItem">
+    <tree name="GlAccountTree" entity-name="GlAccount" root-node-name="node-root" default-render-style="expand-collapse" default-wrap-style="accountItem" expand-collapse-request="GlAccountNavigate">
+        <node name="node-root" render-style="simple">
+            <sub-node node-name="node-body">
+                <entity-and entity-name="GlAccount">
+                    <field-map field-name="parentGlAccountId" from-field="null"/>
+                    <order-by field-name="glAccountId"/>
+                </entity-and>
+            </sub-node>
+        </node>
+        <node name="node-body">
+            <entity-one entity-name="GlAccount" value-field="glAccount"></entity-one>
+            <link target="GlAccountNavigate" text="${glAccountId} ${glAccount.accountName} ${postedBalance}">
+                <parameter param-name="glAccountId"/>
+                <parameter param-name="trail"/>
+            </link>
+            <sub-node node-name="node-body">
+                <entity-and entity-name="GlAccount">
+                    <field-map field-name="parentGlAccountId" from-field="glAccountId"/>
+                    <order-by field-name="glAccountId"/>
+                </entity-and>
+            </sub-node>
+        </node>
+    </tree>
+    <tree name="ListGlAccountTree" entity-name="GlAccount" root-node-name="node-root" default-render-style="expand-collapse" default-wrap-style="accountItem">
         <node name="node-root" render-style="simple">
             <sub-node node-name="node-body">
                 <entity-and entity-name="GlAccount">

Modified: ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=948019&r1=948018&r2=948019&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsScreens.xml (original)
+++ ofbiz/branches/release10.04/applications/accounting/widget/GlobalGlAccountsScreens.xml Tue May 25 12:15:14 2010
@@ -152,7 +152,7 @@ under the License.
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleViewGlAccountEntries}">
-                            <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/>
+                            <include-tree name="ListGlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/>
                         </screenlet>
                         <screenlet title="${uiLabelMap.PageTitleViewGlAccountEntries}">
                             <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
@@ -178,7 +178,7 @@ under the License.
                     <decorator-section name="body">
                         <include-menu name="GlAccountTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
                         <screenlet title="${uiLabelMap.PageTitleViewAccountingTransaction}">
-                            <include-tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/>
+                            <include-tree name="ListGlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/>
                         </screenlet>
                         <screenlet title="${uiLabelMap.PageTitleViewAccountingTransaction}">
                             <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlobalGlAccountsForms.xml"/>
@@ -207,7 +207,7 @@ under the License.
 
                         <!-- include-screen screen-name="ListGlAccounts" name="ListGlAccounts" / -->
 
-                        <!-- tree name="GlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/ -->
+                        <!-- tree name="ListGlAccountTree" location="component://accounting/widget/AccountingTrees.xml"/ -->
                      </decorator-section>
                 </decorator-screen>
             </widgets>