diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml index 7fbeaf340838547bd4addff910e378da11ea6781..49a201e76c2a0ce0bd3cfae9c081bb15912ef845 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml @@ -110,9 +110,18 @@ for business_field in business_field_list:\n \n line = newTempBase(context, \'tmp_glossary_field_%s\' % c)\n c += 1\n - line.edit(title=field.get_value(\'title\'),\n + field_title = field.get_value(\'title\')\n + field_note_list = []\n + if field.meta_type==\'ProxyField\':\n + if field.is_delegated(\'title\') is True:\n + field_note_list.append(\'Delegated.\')\n + elif field.get_tales_expression(\'title\') is not None:\n + field_note_list.append(\'Tales is used.\')\n +\n + line.edit(field_title=field_title,\n field_path=field_path,\n field_edit_url = \'%s/manage_main\' % field.absolute_url(),\n + field_note=\' \'.join(field_note_list),\n reference=reference,\n term_list=term_list,\n field_meta_type=field.meta_type\n @@ -187,6 +196,10 @@ return line_list\n <string>field_path</string> <string>line</string> <string>_inplacevar_</string> + <string>field_title</string> + <string>field_note_list</string> + <string>True</string> + <string>None</string> </tuple> </value> </item> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml index c2771ab2f389ff05b3d316afebc563bd2d44d1af..36116bb782c3dad0701eeea090acf594f8442192 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml @@ -341,7 +341,11 @@ <string>Meta Type</string> </tuple> <tuple> - <string>title</string> + <string>field_note</string> + <string>Note</string> + </tuple> + <tuple> + <string>field_title</string> <string>Title</string> </tuple> <tuple> @@ -418,7 +422,7 @@ </item> <item> <key> <string>list_action</string> </key> - <value> <string>GlossaryModule_viewFieldAndTermComparisonDialog</string> </value> + <value> <string>list</string> </value> </item> <item> <key> <string>list_method</string> </key> @@ -494,7 +498,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>listbox</string> </value> + <value> <string>Field List</string> </value> </item> <item> <key> <string>url_columns</string> </key> @@ -509,7 +513,11 @@ <string></string> </tuple> <tuple> - <string>title</string> + <string>field_note</string> +<string></string> + </tuple> + <tuple> + <string>field_title</string> <string></string> </tuple> <tuple> diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermConparisonDialog.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermConparisonDialog.xml deleted file mode 100644 index e760a647dfb2c2b722721269e7dc9324048d4c2d..0000000000000000000000000000000000000000 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermConparisonDialog.xml +++ /dev/null @@ -1,153 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="ERP5Form" module="Products.ERP5Form.Form"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <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/> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_objects</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>action</string> </key> - <value> <string>GlossaryModule_updateFieldByTerm</string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>encoding</string> </key> - <value> <string>UTF-8</string> </value> - </item> - <item> - <key> <string>enctype</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>group_list</string> </key> - <value> - <list> - <string>left</string> - <string>right</string> - <string>center</string> - <string>bottom</string> - <string>hidden</string> - </list> - </value> - </item> - <item> - <key> <string>groups</string> </key> - <value> - <dictionary> - <item> - <key> <string>bottom</string> </key> - <value> - <list> - <string>listbox</string> - </list> - </value> - </item> - <item> - <key> <string>center</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> - <list> - <string>listbox_term</string> - </list> - </value> - </item> - <item> - <key> <string>left</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>right</string> </key> - <value> - <list/> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>GlossaryModule_viewFieldAndTermConparisonDialog</string> </value> - </item> - <item> - <key> <string>method</string> </key> - <value> <string>POST</string> </value> - </item> - <item> - <key> <string>name</string> </key> - <value> <string>GlossaryModule_viewFieldAndTermConparisonDialog</string> </value> - </item> - <item> - <key> <string>pt</string> </key> - <value> <string>form_dialog</string> </value> - </item> - <item> - <key> <string>row_length</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>stored_encoding</string> </key> - <value> <string>UTF-8</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Update Fields</string> </value> - </item> - <item> - <key> <string>unicode_mode</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>update_action</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision index 725cdcde65066b900790a2033dd6e9be01d6ba96..a0b994e3724ff2518eb7788ff74a96aa25dfca36 100644 --- a/bt5/erp5_forge/bt/revision +++ b/bt5/erp5_forge/bt/revision @@ -1 +1 @@ -193 \ No newline at end of file +195 \ No newline at end of file