Commit adc321d8 authored by Yusei Tahara's avatar Yusei Tahara

Merge Predicate_edit into Base_edit.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17906 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 618920dd
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<string>Products.PythonScripts.PythonScript</string> <tuple/>
<string>PythonScript</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -116,6 +113,13 @@ def editListBox(listbox_field, listbox):\n ...@@ -116,6 +113,13 @@ def editListBox(listbox_field, listbox):\n
hidden_attributes = map(lambda x:x[0], listbox_field.get_value(\'global_attributes\'))\n hidden_attributes = map(lambda x:x[0], listbox_field.get_value(\'global_attributes\'))\n
for k in hidden_attributes:\n for k in hidden_attributes:\n
gv[k] = getattr(request, k, None)\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 for url, v in listbox.items():\n
v.update(gv)\n v.update(gv)\n
context.restrictedTraverse(url).edit(**v)\n context.restrictedTraverse(url).edit(**v)\n
......
...@@ -3,11 +3,8 @@ ...@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="ERP5Form" module="Products.ERP5Form.Form"/>
<string>Products.ERP5Form.Form</string> <tuple/>
<string>ERP5Form</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
...@@ -47,7 +44,11 @@ ...@@ -47,7 +44,11 @@
</item> </item>
<item> <item>
<key> <string>action</string> </key> <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>
<item> <item>
<key> <string>encoding</string> </key> <key> <string>encoding</string> </key>
......
602 603
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment