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

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Nov 29 14:59:35 2007
New Revision: 17906

URL: http://svn.erp5.org?rev=17906&view=rev
Log:
Merge Predicate_edit into Base_edit.

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=17906&r1=17905&r2=17906&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 14:59:35 2007
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -116,9 +113,16 @@
       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
-    for url, v in listbox.items():\n
-      v.update(gv)\n
-      context.restrictedTraverse(url).edit(**v)\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
 \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=17906&r1=17905&r2=17906&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 14:59:35 2007
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -47,7 +44,11 @@
         </item>
         <item>
             <key> <string>action</string> </key>
-            <value> <string>Predicate_edit</string> </value>
+            <value> <string>Base_edit</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>encoding</string> </key>

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=17906&r1=17905&r2=17906&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Thu Nov 29 14:59:35 2007
@@ -1,1 +1,1 @@
-602
+603