[Erp5-report] r17201 - in /erp5/trunk/products/ERP5Form: ./ Extensions/

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Oct 26 13:42:10 2007
New Revision: 17201

URL: http://svn.erp5.org?rev=17201&view=rev
Log:
Set the title of the module to module_title, don't guess it from portal type
name.

Modified:
    erp5/trunk/products/ERP5Form/Extensions/ERP5Site_createModuleScribus.py
    erp5/trunk/products/ERP5Form/ScribusUtils.py

Modified: erp5/trunk/products/ERP5Form/Extensions/ERP5Site_createModuleScribus.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Extensions/ERP5Site_createModuleScribus.py?rev=17201&r1=17200&r2=17201&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Extensions/ERP5Site_createModuleScribus.py (original)
+++ erp5/trunk/products/ERP5Form/Extensions/ERP5Site_createModuleScribus.py Fri Oct 26 13:42:10 2007
@@ -331,7 +331,8 @@
   ManageModule.registerModule(portal,
                               module_id,
                               module_portal_type,
-                              object_portal_type)
+                              object_portal_type,
+                              module_title)
 
 
   # manage redirection URL

Modified: erp5/trunk/products/ERP5Form/ScribusUtils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/ScribusUtils.py?rev=17201&r1=17200&r2=17201&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/ScribusUtils.py (original)
+++ erp5/trunk/products/ERP5Form/ScribusUtils.py Fri Oct 26 13:42:10 2007
@@ -83,6 +83,7 @@
     object_names['view_pdf'] = temp_portal_type + '_view' +\
                     temp_portal_type + 'AsPdf'
     # declaring form to list the objects of a module
+    # TODO: use module portal type, not "object title + Module"
     object_names['view_list'] = object_title.replace(' ','') +\
                     'Module_view' + temp_portal_type + 'List'
     # declaring main object form
@@ -469,16 +470,14 @@
                            portal,
                            module_id,
                            module_portal_type,
-                           object_portal_type):
+                           object_portal_type,
+                           module_title):
     """
     register Module inside ERP5 instance
     """
-    title_module = ''
-    for word in object_portal_type.split():
-      title_module += str(word.capitalize() + ' ')
     portal.newContent( id          = str(module_id),
                        portal_type = str(module_portal_type),
-                       title       = title_module)
+                       title       = module_title)
 
    
 class ManageFiles: