[Erp5-report] r24987 - in /erp5/trunk/bt5/erp5_forge: ExtensionTemplateItem/ SkinTemplateIt...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Dec 26 15:35:23 2008
New Revision: 24987

URL: http://svn.erp5.org?rev=24987&view=rev
Log:
2008-12-26 kazuhiko
* import categories in Property Type in Glossary view.
* display total number of imported documents.

Modified:
    erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPortalType.xml
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml
    erp5/trunk/bt5/erp5_forge/bt/revision

Modified: erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py?rev=24987&r1=24986&r2=24987&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py [utf8] Fri Dec 26 15:35:23 2008
@@ -8,7 +8,7 @@
     portal).getPropertySheetList()
 
 
-def getPropertySheetAttributeList(name):
+def getPropertySheetAttributeList(self, name):
   from Products.ERP5Type import PropertySheet
   class_ = PropertySheet.__dict__.get(name, None)
   result = []
@@ -17,6 +17,14 @@
       continue
     # we want to get only normal property.
     result.append((i['id'], i.get('description', '')))
+  for i in getattr(class_, '_categories', ()):
+    try:
+      result.append((i, self.getPortalObject().portal_categories[i].getDescription()))
+    except KeyError:
+      result.append((i, ''))
+    except TypeError:
+      # if category is Expression(...), TypeError raises
+      pass
   return result
 
 

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPortalType.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPortalType.xml?rev=24987&r1=24986&r2=24987&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPortalType.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPortalType.xml [utf8] Fri Dec 26 15:35:23 2008
@@ -66,6 +66,7 @@
   return printed\n
 else:\n
   portal_catalog = context.portal_catalog\n
+  num = 0\n
   for i in result:\n
     item_list = portal_catalog(portal_type=\'Glossary Term\',\n
                                reference=i[\'reference\'], language_id=i[\'language\'],\n
@@ -81,9 +82,10 @@
                        business_field=i[\'business_field\'],\n
                        title=i[\'title\'], description=i[\'description\'],\n
                        comment=i[\'field_path\'])\n
+    num += 1\n
 \n
 \n
-portal_status_message = context.Base_translateString(\'Terms created.\')\n
+portal_status_message = context.Base_translateString(\'%d terms created.\' % num)\n
 context.Base_redirect(keep_items={\'portal_status_message\':portal_status_message})\n
 
 
@@ -137,9 +139,11 @@
                             <string>map</string>
                             <string>_getitem_</string>
                             <string>portal_catalog</string>
+                            <string>num</string>
                             <string>item_list</string>
                             <string>len</string>
                             <string>new_id</string>
+                            <string>_inplacevar_</string>
                             <string>portal_status_message</string>
                           </tuple>
                         </value>

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=24987&r1=24986&r2=24987&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_findTermFromPropertySheet.xml [utf8] Fri Dec 26 15:35:23 2008
@@ -66,6 +66,7 @@
   return printed\n
 else:\n
   portal_catalog = context.portal_catalog\n
+  num = 0\n
   for i in result:\n
     item_list = portal_catalog(portal_type=\'Glossary Term\',\n
                                reference=i[\'reference\'], language_id=i[\'language\'],\n
@@ -81,9 +82,10 @@
                        business_field=i[\'business_field\'],\n
                        title=i[\'title\'], description=i[\'description\'],\n
                        comment=i[\'field_path\'])\n
+    num += 1\n
 \n
 \n
-portal_status_message = context.Base_translateString(\'Terms created.\')\n
+portal_status_message = context.Base_translateString(\'%d terms created.\' % num)\n
 context.Base_redirect(keep_items={\'portal_status_message\':portal_status_message})\n
 
 
@@ -137,9 +139,11 @@
                             <string>map</string>
                             <string>_getitem_</string>
                             <string>portal_catalog</string>
+                            <string>num</string>
                             <string>item_list</string>
                             <string>len</string>
                             <string>new_id</string>
+                            <string>_inplacevar_</string>
                             <string>portal_status_message</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=24987&r1=24986&r2=24987&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision [utf8] Fri Dec 26 15:35:23 2008
@@ -1,1 +1,1 @@
-423
+424