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

[nobody at svn.erp5.org]

Author: jm
Date: Tue Nov 23 15:01:05 2010
New Revision: 40541

URL: http://svn.erp5.org?rev=40541&view=rev
Log:
BusinessTemplate_doSvnCommit: fix regression error handling

Modified:
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
    erp5/trunk/bt5/erp5_forge/bt/revision

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml?rev=40541&r1=40540&r2=40541&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml [utf8] Tue Nov 23 15:01:05 2010
@@ -74,9 +74,10 @@ def getRevisionNumber(revision):\n
   except AttributeError:\n
     return revision\n
 \n
-error_kw = {}\n
 if changelog is None or not changelog.strip():\n
   error_msg = "Please set a ChangeLog message."\n
+  error_kw = {}\n
+  method = \'BusinessTemplate_viewSvnChangelog\'\n
 else:\n
   portal_subversion = context.getPortalObject().portal_subversion\n
   exclude_list = added.split(\',\') + modified.split(\',\') + removed.split(\',\')\n
@@ -88,10 +89,12 @@ else:\n
   except SubversionSSLTrustError, e:\n
     error_msg = "SSL Certificate was not recognized"\n
     error_kw = dict(caller=\'commit\', trust_dict=e.getTrustDict())\n
+    method = \'BusinessTemplate_viewSvnSSLTrust\'\n
   except SubversionLoginError, e:\n
     error_msg = "Server needs authentication, no cookie found"\n
     error_kw = dict(caller=\'commit\', realm=e.getRealm(),\n
                     username=portal_subversion.getPreferredUsername())\n
+    method = \'BusinessTemplate_viewSvnLogin\'\n
   else:\n
     return request.RESPONSE.redirect(\'%s/view?%s\' % (\n
       context.absolute_url(),\n
@@ -103,8 +106,9 @@ request.set(\'portal_status_message\', t
 request.set(\'cancel_url\', context.absolute_url() +\n
   \'/BusinessTemplate_viewSvnStatus?do_extract=False\'\n
   \'&portal_status_message=Commit%20cancelled.\')\n
-return context.asContext(added=added, modified=modified, removed=removed,\n
-                         **error_kw).BusinessTemplate_viewSvnChangelog()\n
+context = context.asContext(added=added, modified=modified, removed=removed,\n
+                            **error_kw)\n
+return getattr(context, method)()\n
 
 
 ]]></string> </value>
@@ -160,9 +164,10 @@ return context.asContext(added=added, mo
                             <string>request</string>
                             <string>same_type</string>
                             <string>getRevisionNumber</string>
-                            <string>error_kw</string>
                             <string>None</string>
                             <string>error_msg</string>
+                            <string>error_kw</string>
+                            <string>method</string>
                             <string>context</string>
                             <string>portal_subversion</string>
                             <string>exclude_list</string>
@@ -172,6 +177,7 @@ return context.asContext(added=added, mo
                             <string>e</string>
                             <string>dict</string>
                             <string>_apply_</string>
+                            <string>getattr</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=40541&r1=40540&r2=40541&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision [utf8] Tue Nov 23 15:01:05 2010
@@ -1 +1 @@
-631
\ No newline at end of file
+632
\ No newline at end of file