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

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Nov 29 17:59:44 2007
New Revision: 17908

URL: http://svn.erp5.org?rev=17908&view=rev
Log:
Revert my previous changes.

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml?rev=17908&r1=17907&r2=17908&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml Thu Nov 29 17:59:44 2007
@@ -113,16 +113,9 @@
       hidden_attributes = map(lambda x:x[0], listbox_field.get_value(\'global_attributes\'))\n
       for k in hidden_attributes:\n
         gv[k] = getattr(request, k, None)\n
-    if form_id==\'Predicate_view\':\n
-      # Special procedure for Predicate\n
-      for property, v in listbox.items():\n
-        v.update(gv)\n
-        context.setCriterion(property, **v)\n
-    else:\n
-      # General procedure\n
-      for url, v in listbox.items():\n
-        v.update(gv)\n
-        context.restrictedTraverse(url).edit(**v)\n
+    for url, v in listbox.items():\n
+      v.update(gv)\n
+      context.restrictedTraverse(url).edit(**v)\n
 \n
 def editMatrixBox(matrixbox_field, matrixbox):\n
   """ Function called to edit a Matrix box\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml?rev=17908&r1=17907&r2=17908&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml Thu Nov 29 17:59:44 2007
@@ -44,7 +44,7 @@
         </item>
         <item>
             <key> <string>action</string> </key>
-            <value> <string>Base_edit</string> </value>
+            <value> <string>Predicate_edit</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -109,6 +109,7 @@
                         <string>my_string_index</string>
                         <string>my_int_index</string>
                         <string>my_test_method_id</string>
+                        <string>my_membership_criterion_category_list2</string>
                       </list>
                     </value>
                 </item>

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=17908&r1=17907&r2=17908&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Thu Nov 29 17:59:44 2007
@@ -1,1 +1,1 @@
-603
+605