From 31788581e2775d3da99b1a66a74b59d0e9f33b4b Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Thu, 12 Nov 2009 10:56:06 +0000 Subject: [PATCH] revert r28788 because it is not consistent to add "/view" only in some case. For example, in some cases, we want to have permanent url of images without "/view", and with this method is was not possible. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30523 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_web/WebSection_getPermanentURL.xml | 7 +------ bt5/erp5_web/bt/revision | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getPermanentURL.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getPermanentURL.xml index 657100c3d6..4e94f56002 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getPermanentURL.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getPermanentURL.xml @@ -110,12 +110,7 @@ if document.getValidationState() not in validation_state:\n return document.absolute_url()\n \n # Return the URL\n -# XXX we need to add \'/view\' in web view\'s permanent URL for non-Web Page documents.\n -# If we change the behaviour of index_html() to same as view(), we can remove \'/view\'. \n -if portal_type == \'Web Page\':\n - return "%s/%s" % (context.absolute_url(), reference)\n -else:\n - return "%s/%s/view" % (context.absolute_url(), reference)\n +return "%s/%s" % (context.absolute_url(), reference)\n </string> </value> </item> <item> diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index bbff031a29..e39afc8dd2 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -867 \ No newline at end of file +868 \ No newline at end of file -- 2.30.9