small bugfixes

* reduce a result of 'num of duplicates' by 1
* use a different selection_name in GlossaryModule_viewDuplicateGlossaryTermList/listbox
* add a missing item in more columns in GlossaryModule_viewGlossaryTermList/listbox
* add more information of text output of getting terms from workflow

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26244 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromWorkflow.xml

@@ -61,7 +61,7 @@ if export_tsv:\n
   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\'], i[\'workflow_id\'])))\n
   return printed\n
 else:\n
   portal_catalog = context.portal_catalog\n

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewDuplicateGlossaryTermList/listbox.xml

@@ -201,7 +201,7 @@
                 </item>
                 <item>
                     <key> <string>selection_name</string> </key>
-                    <value> <string>glossary_module_selection</string> </value>
+                    <value> <string>glossary_module_duplicate_term_selection</string> </value>
                 </item>
                 <item>
                     <key> <string>target</string> </key>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_viewGlossaryTermList/listbox.xml

@@ -111,6 +111,10 @@
                           <string>translated_validation_state_title</string>
                           <string>State</string>
                         </tuple>
+                        <tuple>
+                          <string>GlossaryTerm_getDuplicateGlossaryTermCount</string>
+                          <string>Num of duplicates</string>
+                        </tuple>
                         <tuple>
                           <string>causality_title</string>
                           <string>Original English Term</string>

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_zGetDuplicateGlossaryTermList.xml

@@ -160,7 +160,7 @@
 <dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), **selection_params)">\n
 \n
 select distinct\n
-  catalog.path, catalog.uid, count(*) as num_of_duplicates\n
+  catalog.path, catalog.uid, count(*)-1 as num_of_duplicates\n
 from\n
   <dtml-in prefix="table" expr="query[\'from_table_list\']">\n
     <dtml-if "table_key not in (\'catalog\',)">\n
@@ -226,7 +226,7 @@ having\n
 <dtml-let query="portal_catalog.buildSQLQuery(query=portal_catalog.getSecurityQuery(**selection_params), **selection_params)">\n
 \n
 select distinct\n
-  catalog.path, catalog.uid, count(*) as num_of_duplicates\n
+  catalog.path, catalog.uid, count(*)-1 as num_of_duplicates\n
 from\n
   <dtml-in prefix="table" expr="query[\'from_table_list\']">\n
     <dtml-if "table_key not in (\'catalog\',)">\n

bt5/erp5_forge/bt/revision

-453
+454
\ No newline at end of file