[Erp5-report] r21636 - in /erp5/trunk/bt5/erp5_forge: SkinTemplateItem/portal_skins/erp5_gl...

[nobody at svn.erp5.org]

Author: aurel
Date: Tue Jun 17 10:52:40 2008
New Revision: 21636

URL: http://svn.erp5.org?rev=21636&view=rev
Log:
in dialog that update fields from glossary, display current description of the field

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_viewWorkflowAndTermComparisonDialog/listbox.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=21636&r1=21635&r2=21636&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldFieldList.xml Tue Jun 17 10:52:40 2008
@@ -114,6 +114,7 @@
     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
     field_note_list = []\n
     if field.meta_type==\'ProxyField\':\n
       if field.is_delegated(\'title\') is True:\n
@@ -125,6 +126,7 @@
               field_path=field_path,\n
               field_edit_url = \'%s/manage_main\' % field.absolute_url(),\n
               field_note=\' \'.join(field_note_list),\n
+              field_description=field_description,\n
               reference=reference,\n
               term_list=term_list,\n
               field_meta_type=field.meta_type\n
@@ -206,6 +208,7 @@
                             <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>

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=21636&r1=21635&r2=21636&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.xml Tue Jun 17 10:52:40 2008
@@ -123,12 +123,13 @@
     else: # type == \'action\'\n
       wf_item_path = \'%s/transitions/%s_actbox_name\' % (wf_item.aq_parent.aq_parent.id, wf_item.id)\n
       wf_item_title = wf_item.actbox_name\n
-    \n
+    wf_item_description = wf_item.description\n
 \n
     line.edit(wf_item_path=wf_item_path,\n
               wf_item_type=type,\n
               wf_item_title=wf_item_title,\n
               wf_item_edit_url = "%s/manage_properties" % wf_item.absolute_url(),\n
+              wf_item_description = wf_item_description,\n
               reference=reference,\n
               term_list=term_list\n
               )\n
@@ -212,6 +213,7 @@
                             <string>_inplacevar_</string>
                             <string>wf_item_path</string>
                             <string>wf_item_title</string>
+                            <string>wf_item_description</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=21636&r1=21635&r2=21636&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewFieldAndTermComparisonDialog/listbox.xml Tue Jun 17 10:52:40 2008
@@ -347,6 +347,10 @@
                         <tuple>
                           <string>field_title</string>
                           <string>Title</string>
+                        </tuple>
+                        <tuple>
+                          <string>field_description</string>
+                          <string>Current Description</string>
                         </tuple>
                         <tuple>
                           <string>term</string>

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=21636&r1=21635&r2=21636&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewWorkflowAndTermComparisonDialog/listbox.xml Tue Jun 17 10:52:40 2008
@@ -343,6 +343,10 @@
                         <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>

Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=21636&r1=21635&r2=21636&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision Tue Jun 17 10:52:40 2008
@@ -1,1 +1,1 @@
-244
+246