Skip to content

erp5
erp5
Commit 6249f9b3 authored by Bartek Górny's avatar Bartek Górny
Browse files
Options

Fixed calculation of relation field params from field id. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18872 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 54472840
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 23 deletions
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getFieldParameterDict.xml 0 → 100644
View file @ 6249f9b3
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""\n
Get default relation string field parameters\n
based on its id\n
"""\n
id = context.getId()\n
if not id.startswith(\'my_\'): return {} # this should not happen\n
\n
if id.endswith(\'_relative_url\'): idx = 2\n
elif id.endswith(\'_title\'): idx = 1\n
else: idx = 0\n
\n
# can it be translated title, or something else?\n
\n
pieces = id.split(\'_\')\n
parameter_dict = dict()\n
parameter_dict[\'base_category\'] = \'_\'.join(pieces[1:-idx])\n
parameter_dict[\'catalog_index\'] = \'_\'.join(pieces[-idx:])\n
return parameter_dict\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>_getattr_</string>
<string>context</string>
<string>id</string>
<string>idx</string>
<string>pieces</string>
<string>dict</string>
<string>parameter_dict</string>
<string>_getitem_</string>
<string>_write_</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getFieldParameterDict</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_viewFieldLibrary/my_relation_field.xml
View file @ 6249f9b3
......@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ERP5Form.RelationField</string>
<string>RelationStringField</string>
</tuple>
<none/>
<global name="RelationStringField" module="Products.ERP5Form.RelationField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
......@@ -535,18 +532,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: field.getId().replace(\'my_\', \'\', 1)</string> </value>
<value> <string>python: field.Base_getFieldParameterDict()[\'base_category\']</string> </value>
</item>
</dictionary>
</pickle>
......@@ -554,18 +548,15 @@
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: field.getId().split(\'_\')[-1]</string> </value>
<value> <string>python: field.Base_getFieldParameterDict()[\'catalog_index\']</string> </value>
</item>
</dictionary>
</pickle>
......@@ -573,11 +564,8 @@
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
......
product/ERP5/bootstrap/erp5_core/bt/revision
View file @ 6249f9b3
687
\ No newline at end of file
688
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7