[Erp5-report] r20124 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Mar 25 17:11:04 2008
New Revision: 20124

URL: http://svn.erp5.org?rev=20124&view=rev
Log:
Fix grouping dialog for multiple page selections

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_updateGroupingReference.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.xml?rev=20124&r1=20123&r2=20124&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.xml Tue Mar 25 17:11:04 2008
@@ -72,10 +72,16 @@
 from ZODB.POSException import ConflictError\n
 portal = context.getPortalObject()\n
 getobject = portal.portal_catalog.getobject\n
+stool = portal.portal_selections\n
 N_ = portal.Base_translateString\n
 psm = N_(\'Nothing matches\')\n
 request = container.REQUEST\n
 precision = request.get(\'precision\', 2)\n
+\n
+# update selected uids \n
+stool.updateSelectionCheckedUidList(\n
+    list_selection_name, uids=uids, listbox_uid=listbox_uid, REQUEST=request)\n
+uids = stool.getSelectionCheckedUidsFor(list_selection_name)\n
 \n
 # XXX when should it be validated ?\n
 if node == \'\':\n
@@ -107,11 +113,6 @@
 request.set(\'total_selected_amount\', total_selected_amount)\n
 \n
 if update:\n
-  # update selected uids \n
-  portal.portal_selections.updateSelectionCheckedUidList(\n
-            selection_name, uids=uids, listbox_uid=listbox_uid,\n
-            REQUEST=context.REQUEST)\n
-    \n
   request.set(\'portal_status_message\', N_(\'Updated\'))\n
   return context.AccountingTransactionModule_viewGroupingFastInputDialog(request)\n
   \n
@@ -123,6 +124,9 @@
   if grouped_line_list:\n
     psm = N_(\'${grouped_line_count} Lines Grouped\',\n
           mapping=dict(grouped_line_count=len(grouped_line_list)))\n
+\n
+    # make sure nothing will be checked next time\n
+    stool.setSelectionCheckedUidsFor(list_selection_name, [])\n
 \n
     # we check if we can mark some transaction as payed.\n
     transaction_list = {}\n
@@ -175,6 +179,9 @@
   psm = N_(\'${ungrouped_line_count} Lines Ungrouped\',\n
             mapping=dict(ungrouped_line_count=len(ungrouped_line_list)))\n
 \n
+  # make sure nothing will be checked next time\n
+  stool.setSelectionCheckedUidsFor(list_selection_name, [])\n
+\n
 request.set(\'portal_status_message\', psm)\n
 return context.AccountingTransactionModule_viewGroupingFastInputDialog(request)\n
 </string> </value>
@@ -199,7 +206,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>uids=[], listbox=None, listbox_uid=[], selection_name=\'\', grouping=\'\', node=\'\', mirror_section=\'\', update=0, **kw</string> </value>
+            <value> <string>uids=[], listbox=None, listbox_uid=[], list_selection_name=\'\', grouping=\'\', node=\'\', mirror_section=\'\', update=0, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -228,7 +235,7 @@
                             <string>uids</string>
                             <string>listbox</string>
                             <string>listbox_uid</string>
-                            <string>selection_name</string>
+                            <string>list_selection_name</string>
                             <string>grouping</string>
                             <string>node</string>
                             <string>mirror_section</string>
@@ -242,6 +249,7 @@
                             <string>context</string>
                             <string>portal</string>
                             <string>getobject</string>
+                            <string>stool</string>
                             <string>N_</string>
                             <string>psm</string>
                             <string>container</string>

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_updateGroupingReference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_updateGroupingReference.xml?rev=20124&r1=20123&r2=20124&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_updateGroupingReference.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_updateGroupingReference.xml Tue Mar 25 17:11:04 2008
@@ -73,7 +73,7 @@
                         uids=uids,\n
                         listbox=listbox,\n
                         listbox_uid=listbox_uid,\n
-                        selection_name=list_selection_name,\n
+                        list_selection_name=list_selection_name,\n
                         node=node,\n
                         mirror_section=mirror_section,\n
                         update=1)\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=20124&r1=20123&r2=20124&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Tue Mar 25 17:11:04 2008
@@ -1,1 +1,1 @@
-656
+657