[Erp5-report] r21673 - in /erp5admin/trunk/erp5_admin: SkinTemplateItem/portal_skins/erp5_a...

[nobody at svn.erp5.org]

Author: bartek
Date: Wed Jun 18 11:57:10 2008
New Revision: 21673

URL: http://svn.erp5.org?rev=21673&view=rev
Log:
edit selected now is able to find workflow scripts too (beware: works  well only if workflow script names are unique site-wide - does not yet support multiple choice)

Modified:
    erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_getDefaultObjectPath.xml
    erp5admin/trunk/erp5_admin/bt/revision

Modified: erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_getDefaultObjectPath.xml
URL: http://svn.erp5.org/erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_getDefaultObjectPath.xml?rev=21673&r1=21672&r2=21673&view=diff
==============================================================================
--- erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_getDefaultObjectPath.xml (original)
+++ erp5admin/trunk/erp5_admin/SkinTemplateItem/portal_skins/erp5_admin/Admin_getDefaultObjectPath.xml Wed Jun 18 11:57:10 2008
@@ -72,12 +72,19 @@
 \n
 st = context.portal_skins\n
 path = st.getSkinPath(\'View\')\n
-for p in path.split(\',\'):\n
-  skin = getattr(st, p)\n
-  f = getattr(skin, object_id)\n
-  path = f.getPhysicalPath()\n
-  if \'portal_skins\' in path:\n
-    return path\n
+try:\n
+  for p in path.split(\',\'):\n
+    skin = getattr(st, p)\n
+    f = getattr(skin, object_id)\n
+    path = f.getPhysicalPath()\n
+    if \'portal_skins\' in path:\n
+      return path\n
+except AttributeError: # not in skins, workflows, perhaps?\n
+  wf_tool = context.portal_workflow\n
+  for wf in wf_tool.objectValues():\n
+    f = getattr(wf.scripts, object_id, None)\n
+    if f is not None:\n
+      return f.getPhysicalPath()\n
 </string> </value>
         </item>
         <item>
@@ -136,6 +143,10 @@
                             <string>getattr</string>
                             <string>skin</string>
                             <string>f</string>
+                            <string>AttributeError</string>
+                            <string>wf_tool</string>
+                            <string>wf</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5admin/trunk/erp5_admin/bt/revision
URL: http://svn.erp5.org/erp5admin/trunk/erp5_admin/bt/revision?rev=21673&r1=21672&r2=21673&view=diff
==============================================================================
--- erp5admin/trunk/erp5_admin/bt/revision (original)
+++ erp5admin/trunk/erp5_admin/bt/revision Wed Jun 18 11:57:10 2008
@@ -1,1 +1,1 @@
-28
+29