From 8076f9ef68f8d0a368b15313ff1ac099c8a5ccb2 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Fri, 30 Jun 2006 15:44:50 +0000 Subject: [PATCH] This is the right file content... git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8269 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_xhtml_style/Base_getHelpUrl.xml | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_getHelpUrl.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_getHelpUrl.xml index 0578a8abff..315852e888 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_getHelpUrl.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_getHelpUrl.xml @@ -68,14 +68,14 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>if context.REQUEST.has_key(\'workflow_action\'): # We are on a workflow transition\n - help = \'%s#%s\' % (getattr(getattr(context, form_id), \'form_action\'),context.REQUEST[\'workflow_action\'])\n -elif action is not None:\n - help = \'%s#%s\' % (context.getPortalType(), action)\n -elif form_id is not None:\n - help = \'%s_%s\' % (context.getPortalType(), form_id)\n -else:\n - help = context.getPortalType()\n + <value> <string>help = context.getPortalType()\n +if workflow_action is not None: # First, the workflow transition case.\n + help = \'%s_%s\' % (help, workflow_action)\n +elif current_action is not None: # Then, we are able to get the action.\n + help = \'%s_%s\' % (help, current_action[\'id\'])\n +elif dialog_id is not None: # Otherwise, get the form we are in.\n + help = \'%s_%s\' % (help, dialog_id)\n +# Otherwise again, just use the portal type as page name.\n return \'%s/%s\' % (context.portal_preferences.getPreferredHtmlStyleDocumentationBaseUrl(), help)\n </string> </value> </item> @@ -99,7 +99,7 @@ return \'%s/%s\' % (context.portal_preferences.getPreferredHtmlStyleDocumentatio </item> <item> <key> <string>_params</string> </key> - <value> <string>form_id = None, action = None</string> </value> + <value> <string>form_id=\'\', current_action=\'\', dialog_id=\'\', workflow_action=\'\'</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -119,20 +119,21 @@ return \'%s/%s\' % (context.portal_preferences.getPreferredHtmlStyleDocumentatio <dictionary> <item> <key> <string>co_argcount</string> </key> - <value> <int>2</int> </value> + <value> <int>4</int> </value> </item> <item> <key> <string>co_varnames</string> </key> <value> <tuple> <string>form_id</string> - <string>action</string> + <string>current_action</string> + <string>dialog_id</string> + <string>workflow_action</string> <string>_getattr_</string> <string>context</string> - <string>getattr</string> - <string>_getitem_</string> <string>help</string> <string>None</string> + <string>_getitem_</string> </tuple> </value> </item> @@ -145,8 +146,10 @@ return \'%s/%s\' % (context.portal_preferences.getPreferredHtmlStyleDocumentatio <key> <string>func_defaults</string> </key> <value> <tuple> - <none/> - <none/> + <string></string> + <string></string> + <string></string> + <string></string> </tuple> </value> </item> -- 2.30.9