[Erp5-report] r38696 jerome - in /erp5/trunk/bt5/erp5_budget: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Sep 28 09:26:05 2010
New Revision: 38696

URL: http://svn.erp5.org?rev=38696&view=rev
Log:
use group strict membership here as well

Modified:
    erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog.xml
    erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getBudgetConsumptionReportData.xml
    erp5/trunk/bt5/erp5_budget/bt/revision

Modified: erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog.xml?rev=38696&r1=38695&r2=38696&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog.xml [utf8] Tue Sep 28 09:26:05 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-        <tuple/>
-      </tuple>
+      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -97,6 +94,7 @@
                     <value>
                       <list>
                         <string>your_section_category</string>
+                        <string>your_section_category_strict</string>
                         <string>your_from_date</string>
                         <string>your_at_date</string>
                         <string>your_format</string>

Modified: erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getBudgetConsumptionReportData.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getBudgetConsumptionReportData.xml?rev=38696&r1=38695&r2=38696&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getBudgetConsumptionReportData.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_getBudgetConsumptionReportData.xml [utf8] Tue Sep 28 09:26:05 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,6 +73,7 @@ if context.getPortalType() == \'Budget\'
 else:\n
   # ... or on the budget module, and in this case, all budgets are used\n
   defined_group = request[\'section_category\']\n
+  strict_section_membership = request.get(\'section_category_strict\', False)\n
   from_date = request.get(\'from_date\')\n
   at_date = request.get(\'at_date\')\n
   validation_state = request.get(\'validation_state\', [])\n
@@ -88,16 +86,9 @@ else:\n
   filtered_budget_list = []\n
   for budget in budget_list:\n
     budget = budget.getObject()\n
-    if \'group\' in budget.getVariationBaseCategoryList():\n
-      group_matches = False\n
-      for category in budget.getVariationCategoryList():\n
-        if category.startswith(defined_group): \n
-          group_matches = True\n
-          break\n
-    if not group_matches:\n
-      continue\n
-    group_filtered_budget_list.append(budget)\n
-\n
+    if budget.isMemberOf(defined_group, strict_membership=strict_section_membership):\n
+      group_filtered_budget_list.append(budget)\n
+  \n
   if from_date or at_date:\n
     for budget in group_filtered_budget_list:\n
       if from_date and budget.getStartDateRangeMax() < from_date:\n
@@ -123,6 +114,7 @@ def isVisibleCell(cell_key):\n
   # can this cell be viewed by this user ?\n
   for category in cell_key:\n
     if category.startswith(\'group/\'):\n
+      # strict group membership seems useless at cell level\n
       if not category.startswith(defined_group):\n
         return False\n
   return True\n
@@ -450,15 +442,14 @@ return pformat(line_list)\n
                             <string>category</string>
                             <string>budget_list</string>
                             <string>_getitem_</string>
+                            <string>False</string>
+                            <string>strict_section_membership</string>
                             <string>from_date</string>
                             <string>at_date</string>
                             <string>validation_state</string>
                             <string>group_filtered_budget_list</string>
                             <string>filtered_budget_list</string>
                             <string>budget</string>
-                            <string>False</string>
-                            <string>group_matches</string>
-                            <string>True</string>
                             <string>line_list</string>
                             <string>None</string>
                             <string>target_currency_title</string>
@@ -466,6 +457,7 @@ return pformat(line_list)\n
                             <string>conversion_ratio</string>
                             <string>isVisibleCell</string>
                             <string>dict</string>
+                            <string>True</string>
                             <string>budget_line</string>
                             <string>total_level_1_initial_budget</string>
                             <string>total_level_1_current_budget</string>

Modified: erp5/trunk/bt5/erp5_budget/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_budget/bt/revision?rev=38696&r1=38695&r2=38696&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_budget/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_budget/bt/revision [utf8] Tue Sep 28 09:26:05 2010
@@ -1 +1 @@
-329
\ No newline at end of file
+330
\ No newline at end of file