From ba3f3e4ba65e6ef8c3548f0ae7cc36d38950988b Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 6 May 2009 08:35:41 +0000 Subject: [PATCH] propagate the ignore_layout parameter in breadcrumb links. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26824 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_xhtml_style/breadcrumbs.xml | 8 +++++--- product/ERP5/bootstrap/erp5_xhtml_style/bt/revision | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/breadcrumbs.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/breadcrumbs.xml index 09dc1eb7c2..c0436b3d90 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/breadcrumbs.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/breadcrumbs.xml @@ -180,11 +180,11 @@ ptool = getToolByName(script, \'portal_properties\')\n utool = getToolByName(script, \'portal_url\')\n portal_url = utool()\n result = []\n -\n +param = int(context.REQUEST.get(\'ignore_layout\', 0)) and \'?ignore_layout:int=1\' or \'\'\n if include_root:\n result.append( { \'id\' : \'root\'\n , \'title\' : ptool.title()\n - , \'url\' : \'%s/view\' % portal_url\n + , \'url\' : \'%s/view%s\' % (portal_url, param)\n }\n )\n \n @@ -207,7 +207,7 @@ for name in relative:\n if not name == \'talkback\':\n result.append( { \'id\' : name\n , \'title\' : title\n - , \'url\' : \'%s/%s/view\' % (portal_url, \'/\'.join(now))\n + , \'url\' : \'%s/%s/view%s\' % (portal_url, \'/\'.join(now), param)\n }\n )\n module = False\n @@ -263,8 +263,10 @@ return result\n <string>utool</string> <string>portal_url</string> <string>result</string> + <string>int</string> <string>_getattr_</string> <string>context</string> + <string>param</string> <string>relative</string> <string>portal</string> <string>obj</string> diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 6b9b650b30..4a533e3dd9 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -744 \ No newline at end of file +745 \ No newline at end of file -- 2.30.9