[Erp5-report] r35447 fabien - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: fabien
Date: Wed May 19 09:42:58 2010
New Revision: 35447

URL: http://svn.erp5.org?rev=35447&view=rev
Log:
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);

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml?rev=35447&r1=35446&r2=35447&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml [utf8] Wed May 19 09:42:58 2010
@@ -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

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=35447&r1=35446&r2=35447&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Wed May 19 09:42:58 2010
@@ -1,1 +1,1 @@
-947
+948