[Erp5-report] r21202 - in /erp5/trunk/bt5/erp5_forge: SkinTemplateItem/portal_skins/erp5_gl...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed May 28 19:24:05 CEST 2008
Author: yusei
Date: Wed May 28 19:24:05 2008
New Revision: 21202
URL: http://svn.erp5.org?rev=21202&view=rev
Log:
2008-05-28 yusei
* Add comment field in GlossaryTerm_view and original location where correspnding field or workflow id was found will be stored in the comment field.
Added:
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_comment.xml
Modified:
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromWorkflow.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromWorkflow.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view.xml
erp5/trunk/bt5/erp5_forge/bt/change_log
erp5/trunk/bt5/erp5_forge/bt/revision
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml?rev=21202&r1=21201&r2=21202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml Wed May 28 19:24:05 2008
@@ -73,7 +73,8 @@
for i in result:\n
print \'\\t\'.join(map(lambda x:\'"%s"\'%x, (i[\'reference\'], i[\'language\'],\n
i[\'business_field\'],\n
- i[\'title\'], i[\'description\'],)))\n
+ i[\'title\'], i[\'description\'],\n
+ i[\'field_path\'])))\n
return printed\n
else:\n
portal_catalog = context.portal_catalog\n
@@ -90,7 +91,8 @@
container=context,\n
reference=i[\'reference\'], language=i[\'language\'],\n
business_field=i[\'business_field\'],\n
- title=i[\'title\'], description=i[\'description\'])\n
+ title=i[\'title\'], description=i[\'description\'],\n
+ comment=i[\'field_path\'])\n
\n
\n
portal_status_message = context.Base_translateString(\'Terms created.\')\n
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromWorkflow.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromWorkflow.xml?rev=21202&r1=21201&r2=21202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromWorkflow.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromWorkflow.xml Wed May 28 19:24:05 2008
@@ -90,7 +90,8 @@
container=context,\n
reference=i[\'reference\'], language=i[\'language\'],\n
business_field=i[\'business_field\'],\n
- title=i[\'title\'], description=i[\'description\'])\n
+ title=i[\'title\'], description=i[\'description\'],\n
+ comment=i[\'workflow_id\'])\n
\n
\n
portal_status_message = context.Base_translateString(\'Terms created.\')\n
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml?rev=21202&r1=21201&r2=21202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromPropertySheet.xml Wed May 28 19:24:05 2008
@@ -106,11 +106,16 @@
language = \'en\'\n
field = dic[(reference, business_field, title)]\n
description = field.get_value(\'description\')\n
+ field_path = \'%s/%s/%s\' % (field.aq_parent.aq_parent.getId(),\n
+ field.aq_parent.getId(),\n
+ field.getId())\n
result.append({\'reference\':reference,\n
\'language\':language,\n
\'business_field\':business_field,\n
\'title\':title,\n
- \'description\':description})\n
+ \'description\':description,\n
+ \'field_path\':field_path\n
+ })\n
\n
return result\n
</string> </value>
@@ -196,6 +201,7 @@
<string>language</string>
<string>field</string>
<string>description</string>
+ <string>field_path</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromWorkflow.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromWorkflow.xml?rev=21202&r1=21201&r2=21202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromWorkflow.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromWorkflow.xml Wed May 28 19:24:05 2008
@@ -82,20 +82,21 @@
for wf_id in bt.getTemplateWorkflowIdList():\n
wf = getattr(context.portal_workflow, wf_id)\n
if getattr(wf, "interactions", marker) is marker: # only way to make sure it is not an interaction workflow ?\n
- term_dict[(wf_id, bt_id, wf.title, wf.description)] = 1\n
+ term_dict[(wf_id, bt_id, wf.title, wf.description)] = wf_id\n
for state_id, state in wf.states.items():\n
- term_dict[(state_id, bt_id, state.title, state.description)] = 1\n
+ term_dict[(state_id, bt_id, state.title, state.description)] = wf_id\n
for trans_id, trans in wf.transitions.items():\n
- term_dict[(trans_id, bt_id, trans.title, trans.description)] = 1\n
+ term_dict[(trans_id, bt_id, trans.title, trans.description)] = wf_id\n
if trans.trigger_type == 1 and trans.actbox_name: # 1 == TRIGGER_USER_ACTION\n
- term_dict[(\'%s_actbox_name\' % trans_id, bt_id, trans.actbox_name, \'\')] = 1\n
-\n
-for (reference, business_field, title, description) in term_dict.iterkeys():\n
+ term_dict[(\'%s_actbox_name\' % trans_id, bt_id, trans.actbox_name, \'\')] = wf_id\n
+\n
+for (reference, business_field, title, description), workflow_id in term_dict.items():\n
result.append({\'reference\': reference,\n
\'language\': language,\n
\'business_field\': business_field,\n
\'title\': title,\n
- \'description\': description})\n
+ \'description\': description,\n
+ \'workflow_id\':workflow_id})\n
\n
return result\n
</string> </value>
@@ -182,6 +183,7 @@
<string>business_field</string>
<string>title</string>
<string>description</string>
+ <string>workflow_id</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view.xml?rev=21202&r1=21201&r2=21202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view.xml Wed May 28 19:24:05 2008
@@ -97,6 +97,7 @@
<string>my_language</string>
<string>my_title</string>
<string>my_description</string>
+ <string>my_comment</string>
<string>my_translated_validation_state_title</string>
</list>
</value>
Added: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_comment.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_comment.xml?rev=21202&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_comment.xml (added)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryTerm_view/my_comment.xml Wed May 28 19:24:05 2008
@@ -1,0 +1,104 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>title</string>
+ <string>whitespace_preserve</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_comment</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_description</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Comment</string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_forge/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/change_log?rev=21202&r1=21201&r2=21202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_forge/bt/change_log Wed May 28 19:24:05 2008
@@ -1,3 +1,6 @@
+2008-05-28 yusei
+* Add comment field in GlossaryTerm_view and original location where correspnding field or workflow id was found will be stored in the comment field.
+
2008-05-15 yo
* Clean up BusinessTemplate_doSvnUpdate, since it redirected to a strange URL.
Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=21202&r1=21201&r2=21202&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision Wed May 28 19:24:05 2008
@@ -1,1 +1,1 @@
-237
+238
More information about the Erp5-report
mailing list