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

[nobody at svn.erp5.org]

Author: alex
Date: Fri May  2 16:18:53 2008
New Revision: 20868

URL: http://svn.erp5.org?rev=20868&view=rev
Log:
Do not attempt to go on, if no bt is installed.

Modified:
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getBusinessFieldWorkflowList.xml
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_glossary/GlossaryModule_getTermDictListFromWorkflow.xml
    erp5/trunk/bt5/erp5_forge/bt/revision

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=20868&r1=20867&r2=20868&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 Fri May  2 16:18:53 2008
@@ -84,7 +84,9 @@
 \n
 def get_obj_and_reference_list(business_field):\n
   result = []\n
+  # XXX this might be too simple: some business template include more than one skin folder\n
   bt = portal_templates.getInstalledBusinessTemplate("erp5_%s" % business_field)\n
+  if bt is None: return result\n
   for wf_id in bt.getTemplateWorkflowIdList():\n
     wf = getattr(portal_workflow, wf_id)\n
     if getattr(wf, "interactions", marker) is marker: # only way to make sure it is not an interaction workflow ?\n

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=20868&r1=20867&r2=20868&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 Fri May  2 16:18:53 2008
@@ -73,7 +73,9 @@
 result = []\n
 \n
 for bt_id in template_list:\n
+  # XXX this might be too simple: some business template include more than one skin folder\n
   bt = context.portal_templates.getInstalledBusinessTemplate(bt_id)\n
+  if bt is None: continue\n
   if bt_id.startswith(prefix):\n
     bt_id = bt_id[len(prefix):]\n
 \n
@@ -165,6 +167,7 @@
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>bt</string>
+                            <string>None</string>
                             <string>_getitem_</string>
                             <string>len</string>
                             <string>wf_id</string>

Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=20868&r1=20867&r2=20868&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision Fri May  2 16:18:53 2008
@@ -1,1 +1,1 @@
-229
+232