[Erp5-report] r44231 jm - in /erp5/trunk/bt5/erp5_forge: SkinTemplateItem/portal_skins/erp5...

[nobody at svn.erp5.org]

Author: jm
Date: Mon Mar 14 11:55:02 2011
New Revision: 44231

URL: http://svn.erp5.org?rev=44231&view=rev
Log:
erp5_forge: fix errors in login/ssl_trust dialogs on Zope 2.8

Modified:
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnLogin.xml
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnSslTrust.xml
    erp5/trunk/bt5/erp5_forge/bt/revision

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnLogin.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnLogin.xml?rev=44231&r1=44230&r2=44231&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnLogin.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnLogin.xml [utf8] Mon Mar 14 11:55:02 2011
@@ -52,7 +52,12 @@
             <key> <string>_body</string> </key>
             <value> <string>context.getVcsTool().setLogin(auth, user, password)\n
 \n
-return context.REQUEST.traverseName(context, caller)(**caller_kw)\n
+request = context.REQUEST\n
+try:\n
+  traverseName = request.traverseName\n
+except AttributeError: # BBB: Zope2.8\n
+  return request.traverse(\'%s/%s\' % (context.getPath(), caller))(**dict(caller_kw))\n
+return traverseName(context, caller)(**caller_kw)\n
 </string> </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnSslTrust.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnSslTrust.xml?rev=44231&r1=44230&r2=44231&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnSslTrust.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doSvnSslTrust.xml [utf8] Mon Mar 14 11:55:02 2011
@@ -56,7 +56,11 @@ trust_dict=dict((x, request[x]) for x in
 \n
 context.getVcsTool().acceptSSLServer(trust_dict, True)\n
 \n
-return request.traverseName(context, caller)(**caller_kw)\n
+try:\n
+  traverseName = request.traverseName\n
+except AttributeError: # BBB: Zope2.8\n
+  return request.traverse(\'%s/%s\' % (context.getPath(), caller))(**dict(caller_kw))\n
+return traverseName(context, caller)(**caller_kw)\n
 </string> </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=44231&r1=44230&r2=44231&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision [utf8] Mon Mar 14 11:55:02 2011
@@ -1 +1 @@
-648
\ No newline at end of file
+649
\ No newline at end of file