[Erp5-report] r25708 - in /erp5/trunk/bt5/erp5_pdm: SkinTemplateItem/portal_skins/erp5_pdm/...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Feb 25 16:03:10 2009
New Revision: 25708

URL: http://svn.erp5.org?rev=25708&view=rev
Log:
make deleted and invalidated predicate never match

Modified:
    erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_asPredicate.xml
    erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asPredicate.xml
    erp5/trunk/bt5/erp5_pdm/bt/revision

Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_asPredicate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_asPredicate.xml?rev=25708&r1=25707&r2=25708&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_asPredicate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyCell_asPredicate.xml [utf8] Wed Feb 25 16:03:10 2009
@@ -53,7 +53,11 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>base_category_tuple = (\'resource\',)\n
+            <value> <string>if context.getProperty(\'validation_state\') in (\'invalidated\', \'deleted\'):\n
+  # return a predicate that will never apply\n
+  return context.generatePredicate(criterion_property_list=(\'uid\',))\n
+\n
+base_category_tuple = (\'resource\',)\n
 \n
 if context.getSourceSection():\n
   base_category_tuple += (\'source_section\',)\n
@@ -110,9 +114,9 @@
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
-                            <string>base_category_tuple</string>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>base_category_tuple</string>
                             <string>_inplacevar_</string>
                             <string>mapped_value_property_list</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asPredicate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asPredicate.xml?rev=25708&r1=25707&r2=25708&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asPredicate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_asPredicate.xml [utf8] Wed Feb 25 16:03:10 2009
@@ -53,7 +53,11 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>base_category_tuple = (\'resource\',)\n
+            <value> <string>if context.getProperty(\'validation_state\') in (\'invalidated\', \'deleted\'):\n
+  # return a predicate that will never apply\n
+  return context.generatePredicate(criterion_property_list=(\'uid\',))\n
+\n
+base_category_tuple = (\'resource\',)\n
 \n
 if context.getSourceSection():\n
   base_category_tuple += (\'source_section\',)\n
@@ -111,9 +115,9 @@
                           <tuple>
                             <string>args</string>
                             <string>kw</string>
-                            <string>base_category_tuple</string>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>base_category_tuple</string>
                             <string>_inplacevar_</string>
                             <string>mapped_value_property_list</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_pdm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/bt/revision?rev=25708&r1=25707&r2=25708&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] Wed Feb 25 16:03:10 2009
@@ -1,1 +1,1 @@
-302
+303