[Erp5-report] r18843 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jan 23 18:51:58 2008
New Revision: 18843

URL: http://svn.erp5.org?rev=18843&view=rev
Log:
Also skip categories on which the user doesn't have View permission in matrix cell range scripts

Modified:
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_asCellRange.xml
    erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_asCellRange.xml
    erp5/trunk/bt5/erp5_payroll/bt/revision

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_asCellRange.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_asCellRange.xml?rev=18843&r1=18842&r2=18843&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_asCellRange.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_asCellRange.xml Wed Jan 23 18:51:58 2008
@@ -78,7 +78,9 @@
     e.g. : \'2682.0 <= Tranche B < 10728\'\n
   \'\'\'\n
   if cell is None:\n
-    raise "PaySheetModelLine_asCellRange Error", "cell is None"\n
+    # This error happens when the cell is not found in the parent model or any\n
+    # inherited model.\n
+    raise "PaySheetModelLine_asCellRange Error", "cell is None for %s" % name\n
   return \'%s <= %s < %s\' % (str(cell.getQuantityRangeMin()), name,\n
       str(cell.getQuantityRangeMax()))\n
 \n
@@ -93,7 +95,8 @@
     base_category_list = resource.getVariationBaseCategoryList()\n
     for base_category in base_category_list:\n
       category_cell_range = []\n
-      category_item_list = context.getVariationCategoryItemList(base_category_list = (base_category,))\n
+      category_item_list = context.getVariationCategoryItemList(base_category_list = (base_category,),\n
+                                                                checked_permission=\'View\')\n
       for category_item in category_item_list:\n
         if base_category == \'salary_range\':\n
           category_cell_range.append((category_item[1],\\\n

Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_asCellRange.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_asCellRange.xml?rev=18843&r1=18842&r2=18843&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_asCellRange.xml (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_asCellRange.xml Wed Jan 23 18:51:58 2008
@@ -77,13 +77,14 @@
   category_name = category.replace(\'salary_range/\',\'\',1)\n
   if context.portal_categories.getCategoryValue(category) is None:\n
     context.log(\'Category %s not found.\' % category)\n
+    raise ValueError, \'no category %s\' % category\n
   else:\n
     if matrixbox:\n
-      category_list.extend(context.portal_categories.getCategoryValue(category).getCategoryChildLogicalPathItemList(is_right_display=1, base=1)[1:])\n
+      category_list.extend(context.portal_categories.getCategoryValue(category).getCategoryChildLogicalPathItemList(checked_permission=\'View\', is_right_display=1, base=1)[1:])\n
       #category_list.extend(context.portal_categories.getCategoryValue(category).getCategoryChildItemList(base=1, is_right_display=1)[1:])\n
     else:\n
       cat_list = [cat[0] for cat in\n
-          context.portal_categories.salary_range[category_name].getCategoryChildItemList(base=1)[1:]]\n
+          context.portal_categories.salary_range[category_name].getCategoryChildItemList(checked_permission=\'View\', base=1)[1:]]\n
       category_list.append(cat_list)\n
 \n
 return category_list\n
@@ -139,6 +140,7 @@
                             <string>category</string>
                             <string>category_name</string>
                             <string>None</string>
+                            <string>ValueError</string>
                             <string>_getitem_</string>
                             <string>append</string>
                             <string>$append0</string>

Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=18843&r1=18842&r2=18843&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision Wed Jan 23 18:51:58 2008
@@ -1,1 +1,1 @@
-201
+202