[Erp5-report] r30562 - in /erp5/trunk/bt5/erp5_forge: SkinTemplateItem/portal_skins/erp5_to...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Nov 13 14:59:00 CET 2009
Author: jm
Date: Fri Nov 13 14:58:59 2009
New Revision: 30562
URL: http://svn.erp5.org?rev=30562&view=rev
Log:
Manage Field Library: add column to show the current template field
Modified:
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getModifiableFieldList.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/listbox.xml
erp5/trunk/bt5/erp5_forge/bt/revision
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getModifiableFieldList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getModifiableFieldList.xml?rev=30562&r1=30561&r2=30562&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getModifiableFieldList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_getModifiableFieldList.xml [utf8] Fri Nov 13 14:58:59 2009
@@ -140,15 +140,19 @@
# XXX Should check if this field is used as a template\n
field_path = \'%s/%s/%s\' % (skin_folder_id, form_id, field.getId())\n
if field.meta_type == \'ProxyField\':\n
+ template_form_id = field.get_value(\'form_id\')\n
+ template_id = \'%s/%s\' % (template_form_id,\n
+ field.get_value(\'field_id\'))\n
if field.getTemplateField() is None:\n
- modified_object_dict[field_path] = \'0_keep_dead_proxy_field\'\n
+ modified_object_dict[field_path] = (\'0_keep_dead_proxy_field\',\n
+ template_id)\n
else:\n
- template_form_id = field.get_value(\'form_id\')\n
if template_form_id not in (\n
\'Base_viewFieldLibrary\',\n
field_library_id\n
):\n
- modified_object_dict[field_path] = \'2_unproxify_field\'\n
+ modified_object_dict[field_path] = (\'2_unproxify_field\',\n
+ template_id)\n
else:\n
# Do not force proxification of field library field.\n
# The nice developper probably have a good reason not to do it.\n
@@ -158,22 +162,25 @@
for field in form.objectValues():\n
field_path = \'%s/%s/%s\' % (skin_folder_id, form_id, field.getId())\n
if field.meta_type == \'ProxyField\':\n
+ template_form_id = field.get_value(\'form_id\')\n
+ template_id = \'%s/%s\' % (template_form_id,\n
+ field.get_value(\'field_id\'))\n
if field.getTemplateField() is None:\n
- modified_object_dict[field_path] = \'0_keep_dead_proxy_field\'\n
+ modified_object_dict[field_path] = (\'0_keep_dead_proxy_field\',\n
+ template_id)\n
else:\n
- template_form_id = field.get_value(\'form_id\')\n
- # XXX Only considere standard bt5 for now\n
+ # XXX Only consider standard bt5 for now\n
template_form_path = \'%s/%s\' % (skin_folder_id, template_form_id)\n
if template_form_id != field_library_id:\n
- modified_object_dict[field_path] = \'2_unproxify_field\'\n
+ modified_object_dict[field_path] = (\'2_unproxify_field\',\n
+ template_id)\n
# XXX Should proxify to a library\'s field\n
else:\n
# Check that there is no delegated values\n
if field.delegated_list:\n
# Found some delegated list\n
- modified_object_dict[field_path] = \'0_check_delegated_value\'\n
- else:\n
- pass\n
+ modified_object_dict[field_path] = (\n
+ \'0_check_delegated_value\', template_id)\n
else:\n
# Do not force proxification of field.\n
# The nice developper probably have a good reason not to do it.\n
@@ -182,19 +189,23 @@
i = 0\n
for key, value in modified_object_dict.items():\n
line = newTempBase(context, \'tmp_install_%s\' %(str(i)))\n
- \n
+ if isinstance(value, tuple):\n
+ value, template_id = value\n
+ else:\n
+ template_id = None\n
if value.startswith(\'0_\'):\n
choice = []\n
else:\n
choice = [value]\n
line.edit(\n
object_id=key,\n
+ template_id=template_id,\n
choice=choice,\n
choice_item_list=[[action_title_dict[value], value]],\n
)\n
line.setUid(\'new_%s\' % key)\n
field_list.append(line)\n
- i += 1 \n
+ i += 1\n
\n
field_list.sort(key=lambda x:(x.choice_item_list[0][1], x.object_id))\n
\n
@@ -267,12 +278,15 @@
<string>field</string>
<string>field_path</string>
<string>template_form_id</string>
+ <string>template_id</string>
<string>template_form_path</string>
<string>i</string>
<string>key</string>
<string>value</string>
<string>str</string>
<string>line</string>
+ <string>isinstance</string>
+ <string>tuple</string>
<string>choice</string>
<string>_inplacevar_</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/listbox.xml?rev=30562&r1=30561&r2=30562&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_viewFieldLibraryManagementDialog/listbox.xml [utf8] Fri Nov 13 14:58:59 2009
@@ -353,6 +353,10 @@
<string>ID</string>
</tuple>
<tuple>
+ <string>template_id</string>
+ <string>Template</string>
+ </tuple>
+ <tuple>
<string>choice</string>
<string>Update</string>
</tuple>
@@ -421,8 +425,12 @@
<value> <int>0</int> </value>
</item>
<item>
+ <key> <string>hide_rows_on_no_search_criterion</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
<key> <string>lines</string> </key>
- <value> <int>1000</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>list_action</string> </key>
Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=30562&r1=30561&r2=30562&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision [utf8] Fri Nov 13 14:58:59 2009
@@ -1,1 +1,1 @@
-526
+527
More information about the Erp5-report
mailing list