[Erp5-report] r16764 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: romain
Date: Tue Oct  2 09:11:45 2007
New Revision: 16764

URL: http://svn.erp5.org?rev=16764&view=rev
Log:
Do not change category order anymore.
Do not display blank field when user has to fix some errors.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_hashCategoryList.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_hashCategoryList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_hashCategoryList.xml?rev=16764&r1=16763&r2=16764&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_hashCategoryList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_hashCategoryList.xml Tue Oct  2 09:11:45 2007
@@ -84,14 +84,6 @@
 default_sub_field_property_dict.update({\'required\': 0,\'field_type\': \'ListField\',\'size\': 1,\'item_list\': [(\'\', \'\')] + item_list,\'value\': None})\n
 \n
 z = 0\n
-for i in range(1):\n
-  new_dict = default_sub_field_property_dict.copy()\n
-  new_dict[\'title\'] = \' \'\n
-  new_dict[\'key\'] = str(z)\n
-  z += 1\n
-  sub_field_list.append(new_dict)\n
-\n
-value_list.sort()\n
 for value in value_list:\n
   new_dict = default_sub_field_property_dict.copy()\n
   new_dict[\'value\'] = value\n
@@ -100,8 +92,16 @@
   z += 1\n
   sub_field_list.append(new_dict)\n
 \n
-new_dict[\'title\'] = default_sub_field_property_dict[\'title\']\n
-sub_field_list.reverse()\n
+request = context.REQUEST\n
+\n
+if request.get(\'field_errors\', {}) == {}:\n
+  new_dict = default_sub_field_property_dict.copy()\n
+  new_dict[\'title\'] = \' \'\n
+  new_dict[\'key\'] = str(z)\n
+  sub_field_list.append(new_dict)\n
+\n
+if len(sub_field_list):\n
+  sub_field_list[0][\'title\'] = default_sub_field_property_dict[\'title\']\n
 return sub_field_list\n
 
 
@@ -162,12 +162,13 @@
                             <string>None</string>
                             <string>z</string>
                             <string>_getiter_</string>
-                            <string>range</string>
-                            <string>i</string>
+                            <string>value</string>
                             <string>new_dict</string>
                             <string>_write_</string>
                             <string>str</string>
-                            <string>value</string>
+                            <string>context</string>
+                            <string>request</string>
+                            <string>len</string>
                             <string>_getitem_</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=16764&r1=16763&r2=16764&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Tue Oct  2 09:11:45 2007
@@ -1,1 +1,1 @@
-483
+484