From c4eb46cf5ee2cefce48a898c26939ea31e3c657f Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Wed, 19 May 2010 07:42:58 +0000
Subject: [PATCH] the condition "request.get('field_came_from')" was present
 two times in the tales which is useless. Change expression
 "here.absolute_url() + '/view'" to here.getPermanentURL(here);

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35447 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml    | 2 +-
 bt5/erp5_web/bt/revision                                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml
index c857e19e2e..6b4e2ee7fa 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml
@@ -54,7 +54,7 @@
                  dummy python: response.redirect(url);" />\n
     </tal:block>\n
     <tal:block tal:condition="not: isAnon">\n
-      <tal:block tal:define="came_from python: request.get(\'came_from\') or request.get(\'field_came_from\') or request.get(\'field_came_from\') or here.absolute_url() + \'/view\';\n
+      <tal:block tal:define="came_from python: request.get(\'came_from\') or request.get(\'field_came_from\') or here.getPermanentURL(here);\n
                  dummy python: response.redirect(came_from);" />\n
     </tal:block>\n
   </tal:block>\n
diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision
index 5a30e5affa..db8b695779 100644
--- a/bt5/erp5_web/bt/revision
+++ b/bt5/erp5_web/bt/revision
@@ -1 +1 @@
-947
\ No newline at end of file
+948
\ No newline at end of file
-- 
2.30.9