From a1ac3431b85df931eb3217728ca0e6c70bef6210 Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Tue, 13 Oct 2009 12:57:46 +0000 Subject: [PATCH] Fix display of front page when access tab is enabled git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29599 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...CategorizedModuleActionInformationDict.xml | 22 ++++++++----------- .../bootstrap/erp5_xhtml_style/bt/revision | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_getCategorizedModuleActionInformationDict.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_getCategorizedModuleActionInformationDict.xml index 0fcbd45de6..a11d1bc60d 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_getCategorizedModuleActionInformationDict.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_getCategorizedModuleActionInformationDict.xml @@ -94,22 +94,18 @@ def getModuleActionInformationDict(**kw):\n action_dict = module.Base_filterDuplicateActions(listFilteredActionsFor(module))\n \n # Obtain a form id and a selection name from the view.\n + # XXX Is it useful ?\n form_id = \'view\'\n selection_name = \'default_selection\'\n - type_info = module.getTypeInfo()\n - expr = None\n - for ai in type_info.listActions():\n - if ai.getId() == \'view\':\n + for ai in action_dict[\'object_view\']:\n + if ai[\'id\'] == \'view\':\n + form_id = ai[\'url\'].rsplit(\'/\', 1)[-1]\n + form = getattr(portal, form_id, None)\n + if form is not None:\n + listbox = form.Form_getListbox()\n + if listbox is not None:\n + selection_name = listbox.get_value(\'selection_name\')\n break\n - else:\n - ai = None\n - if ai is not None:\n - form_id = str(ai.getActionExpression()).rsplit(\'/\', 1)[-1]\n - form = getattr(portal, form_id, None)\n - if form is not None:\n - listbox = form.Form_getListbox()\n - if listbox is not None:\n - selection_name = listbox.get_value(\'selection_name\')\n \n # Collect view actions.\n module_view_list = [(None, \'%s/view\' % module_url)]\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 4fe21da97a..4ba0ae72ce 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -839 \ No newline at end of file +840 -- 2.30.9