[Erp5-report] r25110 - in /erp5/trunk/bt5/erp5_forge: SkinTemplateItem/portal_skins/erp5_gl...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jan 14 17:08:08 CET 2009
Author: yusei
Date: Wed Jan 14 17:07:59 2009
New Revision: 25110
URL: http://svn.erp5.org?rev=25110&view=rev
Log:
2009-01-14 kazuhiko
* improve Glossary to Field/Workflow comparison dialogues.
Modified:
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox_term.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox_term.xml
erp5/trunk/bt5/erp5_forge/bt/revision
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml?rev=25110&r1=25109&r2=25110&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml [utf8] Wed Jan 14 17:07:59 2009
@@ -64,11 +64,12 @@
term_list = portal_catalog(portal_type=\'Glossary Term\',\n
validation_state=\'validated\',\n
language_id=\'en\',\n
- business_field_title=business_field,\n
+ business_field_title=(\'core\', business_field),\n
reference=reference)\n
return [i.getObject() for i in term_list]\n
\n
def get_field_and_reference_list(business_field):\n
+ business_field = business_field.split(\'/\')[0]\n
result = []\n
skin_folder = getattr(portal_skins, \'erp5_%s\' % business_field, None)\n
if skin_folder is None:\n
@@ -99,7 +100,6 @@
field.aq_parent.getId(),\n
field.getId())\n
\n
- line = newTempBase(context, \'tmp_glossary_field_%s\' % c)\n
c += 1\n
field_title = field.get_value(\'title\')\n
field_description = field.get_value(\'description\')\n
@@ -110,6 +110,12 @@
elif field.get_tales_expression(\'title\') is not None:\n
field_note_list.append(\'Tales is used.\')\n
\n
+ if len(term_list) == 1 and \\\n
+ term_list[0].getTitle() == field_title and \\\n
+ term_list[0].getDescription() == field_description:\n
+ continue\n
+\n
+ line = newTempBase(context, \'tmp_glossary_field_%s\' % c)\n
line.edit(field_title=field_title,\n
field_path=field_path,\n
field_edit_url = \'%s/manage_main\' % field.absolute_url(),\n
@@ -181,13 +187,15 @@
<string>reference</string>
<string>term_list</string>
<string>field_path</string>
- <string>line</string>
<string>_inplacevar_</string>
<string>field_title</string>
<string>field_description</string>
<string>field_note_list</string>
<string>True</string>
<string>None</string>
+ <string>len</string>
+ <string>_getitem_</string>
+ <string>line</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.xml?rev=25110&r1=25109&r2=25110&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.xml [utf8] Wed Jan 14 17:07:59 2009
@@ -66,11 +66,12 @@
term_list = portal_catalog(portal_type=\'Glossary Term\',\n
validation_state=\'validated\',\n
language_id=\'en\',\n
- business_field_title=business_field,\n
+ business_field_title=(\'core\', business_field),\n
reference=reference)\n
return [i.getObject() for i in term_list]\n
\n
def get_obj_and_reference_list(business_field):\n
+ business_field = business_field.split(\'/\')[0]\n
result = []\n
# XXX this might be too simple: some business template include more than one skin folder\n
bt = portal_templates.getInstalledBusinessTemplate("erp5_%s" % business_field)\n
@@ -97,7 +98,6 @@
if not term_list:\n
continue\n
\n
- line = newTempBase(context, \'tmp_glossary_wf_item_%s\' % c)\n
c += 1\n
if type == \'workflow\':\n
wf_item_path = wf_item.id\n
@@ -113,6 +113,12 @@
wf_item_title = wf_item.actbox_name\n
wf_item_description = wf_item.description\n
\n
+ if len(term_list) == 1 and \\\n
+ term_list[0].getTitle() == wf_item_title and \\\n
+ term_list[0].getDescription() == wf_item_description:\n
+ continue\n
+\n
+ line = newTempBase(context, \'tmp_glossary_wf_item_%s\' % c)\n
line.edit(wf_item_path=wf_item_path,\n
wf_item_type=type,\n
wf_item_title=wf_item_title,\n
@@ -185,11 +191,13 @@
<string>reference</string>
<string>type</string>
<string>term_list</string>
- <string>line</string>
<string>_inplacevar_</string>
<string>wf_item_path</string>
<string>wf_item_title</string>
<string>wf_item_description</string>
+ <string>len</string>
+ <string>_getitem_</string>
+ <string>line</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml?rev=25110&r1=25109&r2=25110&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml [utf8] Wed Jan 14 17:07:59 2009
@@ -345,13 +345,48 @@
<string>Note</string>
</tuple>
<tuple>
- <string>field_title</string>
- <string>Title</string>
- </tuple>
- <tuple>
- <string>field_description</string>
- <string>Current Description</string>
- </tuple>
+ <string>term</string>
+ <string>Title / Description</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>count_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default_params</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>domain_root_list</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>domain_tree</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>editable_columns</string> </key>
+ <value>
+ <list>
<tuple>
<string>term</string>
<string>Term</string>
@@ -360,49 +395,6 @@
</value>
</item>
<item>
- <key> <string>count_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default_params</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_root_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>domain_tree</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>editable_columns</string> </key>
- <value>
- <list>
- <tuple>
- <string>term</string>
- <string>Term</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
@@ -505,6 +497,12 @@
<value> <string>Field List</string> </value>
</item>
<item>
+ <key> <string>untranslatable_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
<key> <string>url_columns</string> </key>
<value>
<list>
@@ -518,14 +516,6 @@
</tuple>
<tuple>
<string>field_note</string>
- <string></string>
- </tuple>
- <tuple>
- <string>field_title</string>
- <string></string>
- </tuple>
- <tuple>
- <string>term</string>
<string></string>
</tuple>
</list>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox_term.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox_term.xml?rev=25110&r1=25109&r2=25110&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox_term.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox_term.xml [utf8] Wed Jan 14 17:07:59 2009
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <global name="RadioField" module="Products.Formulator.StandardFields"/>
<tuple/>
</tuple>
</pickle>
@@ -65,10 +65,6 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
@@ -85,11 +81,11 @@
<value> <string></string> </value>
</item>
<item>
+ <key> <string>orientation</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -142,10 +138,6 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
@@ -164,11 +156,11 @@
</value>
</item>
<item>
+ <key> <string>orientation</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -216,10 +208,6 @@
</item>
<item>
<key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -241,12 +229,12 @@
</value>
</item>
<item>
+ <key> <string>orientation</string> </key>
+ <value> <string>vertical</string> </value>
+ </item>
+ <item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>size</string> </key>
- <value> <int>1</int> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -277,7 +265,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.REQUEST.get(\'auto_select\', 0) == 1 and len(CONTEXTS[\'cell\'].term_list) == 1 and CONTEXTS[\'cell\'].term_list[0].getUid() or None</string> </value>
+ <value> <string>python:here.REQUEST.get(\'auto_select\', 0) == 1 and len(cell.term_list) == 1 and cell.term_list[0].getUid() or None</string> </value>
</item>
</dictionary>
</pickle>
@@ -293,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:[(\'\', \'\')] + [("%s, %s" %(i.getTitle(), i.getDescription()[:50]), i.getUid()) for i in CONTEXTS[\'cell\'].term_list]</string> </value>
+ <value> <string>python:[(\'(current) %s / %s\' % (cell.field_title, cell.field_description), \'\')] + [("[%s] %s / %s" %(i.getBusinessFieldTitle(), i.getTitle(), i.getDescription()), i.getUid()) for i in cell.term_list]</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox.xml?rev=25110&r1=25109&r2=25110&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox.xml [utf8] Wed Jan 14 17:07:59 2009
@@ -341,16 +341,8 @@
<string>Type</string>
</tuple>
<tuple>
- <string>wf_item_title</string>
- <string>Title</string>
- </tuple>
- <tuple>
- <string>wf_item_description</string>
- <string>Current Description</string>
- </tuple>
- <tuple>
<string>term</string>
- <string>Term</string>
+ <string>Title / Description</string>
</tuple>
</list>
</value>
@@ -393,7 +385,7 @@
<list>
<tuple>
<string>term</string>
- <string>Term</string>
+ <string>Title / Description</string>
</tuple>
</list>
</value>
@@ -499,6 +491,12 @@
<item>
<key> <string>title</string> </key>
<value> <string>Field List</string> </value>
+ </item>
+ <item>
+ <key> <string>untranslatable_columns</string> </key>
+ <value>
+ <list/>
+ </value>
</item>
<item>
<key> <string>url_columns</string> </key>
@@ -507,18 +505,6 @@
<tuple>
<string>wf_item_path</string>
<string>GlossaryModule_getWorkflowItemEditUrl</string>
- </tuple>
- <tuple>
- <string>wf_item_type</string>
- <string></string>
- </tuple>
- <tuple>
- <string>wf_item_title</string>
- <string></string>
- </tuple>
- <tuple>
- <string>term</string>
- <string></string>
</tuple>
</list>
</value>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox_term.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox_term.xml?rev=25110&r1=25109&r2=25110&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox_term.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox_term.xml [utf8] Wed Jan 14 17:07:59 2009
@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <global name="RadioField" module="Products.Formulator.StandardFields"/>
<tuple/>
</tuple>
</pickle>
@@ -65,10 +65,6 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
@@ -85,11 +81,11 @@
<value> <string></string> </value>
</item>
<item>
+ <key> <string>orientation</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -142,10 +138,6 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
@@ -164,11 +156,11 @@
</value>
</item>
<item>
+ <key> <string>orientation</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>size</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -219,12 +211,8 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>extra_item</string> </key>
- <value> <string></string> </value>
+ <value> <string>style="text-align:left"</string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
@@ -241,16 +229,16 @@
</value>
</item>
<item>
+ <key> <string>orientation</string> </key>
+ <value> <string>vertical</string> </value>
+ </item>
+ <item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>size</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
<key> <string>title</string> </key>
- <value> <string>Term</string> </value>
+ <value> <string>Description</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
@@ -293,7 +281,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:[(\'\', \'\')] + [("%s, %s" %(i.getTitle(), i.getDescription()[:30]), i.getUid()) for i in CONTEXTS[\'cell\'].term_list]</string> </value>
+ <value> <string>python:[(\'(current) %s / %s\' % (cell.wf_item_title, cell.wf_item_description), \'\')] + [("[%s] %s / %s" %(i.getBusinessFieldTitle(), i.getTitle(), i.getDescription()), i.getUid()) for i in CONTEXTS[\'cell\'].term_list]</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=25110&r1=25109&r2=25110&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision [utf8] Wed Jan 14 17:07:59 2009
@@ -1,1 +1,1 @@
-430
+431
More information about the Erp5-report
mailing list