[Erp5-report] r22514 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Jul 17 12:17:20 2008
New Revision: 22514

URL: http://svn.erp5.org?rev=22514&view=rev
Log:
only add visible and not invalidated organisations in Delivery_get*SectionItemList

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getDestinationSectionItemList.xml
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getSourceSectionItemList.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getDestinationSectionItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getDestinationSectionItemList.xml?rev=22514&r1=22513&r2=22514&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getDestinationSectionItemList.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getDestinationSectionItemList.xml Thu Jul 17 12:17:20 2008
@@ -77,14 +77,17 @@
   section_cat_obj = context.portal_categories.resolveCategory(section_cat)\n
 \n
 if section_cat_obj is not None:\n
-  result = section_cat_obj.getGroupRelatedValueList(portal_type=\'Organisation\')\n
+  result = section_cat_obj.getGroupRelatedValueList(portal_type=\'Organisation\',\n
+                                                    checked_permission=\'View\')\n
+  result = [r for r in result\n
+            if r.getProperty(\'validation_state\') not in (\'invalidated\', \'deleted\')]\n
 \n
 current_destination_section = context.getDestinationSectionValue()\n
 if current_destination_section is not None and current_destination_section not in result:\n
   result.append(current_destination_section)\n
 \n
 # convert to ListField format\n
-return [(\'\', \'\')]+[(i.getTitle(), i.getRelativeUrl()) for i in result]\n
+return [(\'\', \'\')] + [(i.getTitle(), i.getRelativeUrl()) for i in result]\n
 </string> </value>
         </item>
         <item>
@@ -139,10 +142,11 @@
                             <string>None</string>
                             <string>section_cat_obj</string>
                             <string>result</string>
-                            <string>current_destination_section</string>
                             <string>append</string>
                             <string>$append0</string>
                             <string>_getiter_</string>
+                            <string>r</string>
+                            <string>current_destination_section</string>
                             <string>i</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getSourceSectionItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getSourceSectionItemList.xml?rev=22514&r1=22513&r2=22514&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getSourceSectionItemList.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_getSourceSectionItemList.xml Thu Jul 17 12:17:20 2008
@@ -77,14 +77,17 @@
   section_cat_obj = context.portal_categories.resolveCategory(section_cat)\n
 \n
 if section_cat_obj is not None:\n
-  result = section_cat_obj.getGroupRelatedValueList(portal_type=\'Organisation\')\n
+  result = section_cat_obj.getGroupRelatedValueList(portal_type=\'Organisation\',\n
+                                                    checked_permission=\'View\')\n
+  result = [r for r in result\n
+            if r.getProperty(\'validation_state\') not in (\'invalidated\', \'deleted\')]\n
 \n
 current_source_section = context.getSourceSectionValue()\n
 if current_source_section is not None and current_source_section not in result:\n
   result.append(current_source_section)\n
 \n
 # convert to ListField format\n
-return [(\'\', \'\')]+[(i.getTitle(), i.getRelativeUrl()) for i in result]\n
+return [(\'\', \'\')] + [(i.getTitle(), i.getRelativeUrl()) for i in result]\n
 </string> </value>
         </item>
         <item>
@@ -139,10 +142,11 @@
                             <string>None</string>
                             <string>section_cat_obj</string>
                             <string>result</string>
-                            <string>current_source_section</string>
                             <string>append</string>
                             <string>$append0</string>
                             <string>_getiter_</string>
+                            <string>r</string>
+                            <string>current_source_section</string>
                             <string>i</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=22514&r1=22513&r2=22514&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Thu Jul 17 12:17:20 2008
@@ -1,1 +1,1 @@
-431
+434