Commit d86b2d6d authored by Christophe Dumez's avatar Christophe Dumez

do not export BT again when cancelling a commit

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7486 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 67aca599
...@@ -94,10 +94,12 @@ else:\n ...@@ -94,10 +94,12 @@ else:\n
\n \n
if \'changelog\' not in context.REQUEST.keys() :\n if \'changelog\' not in context.REQUEST.keys() :\n
context.REQUEST.set(\'portal_status_message\', \'Please set a changelog message...\')\n context.REQUEST.set(\'portal_status_message\', \'Please set a changelog message...\')\n
context.REQUEST.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n
return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n
\n \n
if not changelog :\n if not changelog :\n
context.REQUEST.set(\'portal_status_message\', "Error: Changelog Message can\'t be empty.")\n context.REQUEST.set(\'portal_status_message\', "Error: Changelog Message can\'t be empty.")\n
context.REQUEST.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n
return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n return context.asContext(added=added, modified=modified, removed=removed).BusinessTemplate_viewSvnChangelog()\n
\n \n
try:\n try:\n
...@@ -107,14 +109,16 @@ try:\n ...@@ -107,14 +109,16 @@ try:\n
context.getPortalObject()["portal_subversion"].checkin(path=commit_recurs, business_template=context, recurse=True, log_message=changelog)\n context.getPortalObject()["portal_subversion"].checkin(path=commit_recurs, business_template=context, recurse=True, log_message=changelog)\n
except SubversionSSLTrustError, error:\n except SubversionSSLTrustError, error:\n
context.REQUEST.set(\'portal_status_message\', \'SSL Certificate was not recognized\')\n context.REQUEST.set(\'portal_status_message\', \'SSL Certificate was not recognized\')\n
context.REQUEST.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n
return context.asContext(added=added, modified=modified, removed=removed, trust_dict = error.getTrustDict(), caller=\'commit\', changelog=changelog).BusinessTemplate_viewSvnSSLTrust()\n return context.asContext(added=added, modified=modified, removed=removed, trust_dict = error.getTrustDict(), caller=\'commit\', changelog=changelog).BusinessTemplate_viewSvnSSLTrust()\n
except SubversionLoginError, error1 :\n except SubversionLoginError, error1 :\n
context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n context.REQUEST.set(\'portal_status_message\', \'Server needs authentication, no cookie found\')\n
context.REQUEST.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n
return context.asContext(added=added, modified=modified, removed=removed, caller=\'commit\', realm = error1.getRealm(), changelog=changelog, username = context.getPortalObject()["portal_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n return context.asContext(added=added, modified=modified, removed=removed, caller=\'commit\', realm = error1.getRealm(), changelog=changelog, username = context.getPortalObject()["portal_subversion"].getPreferredUsername()).BusinessTemplate_viewSvnLogin()\n
\n \n
context.REQUEST.set(\'portal_status_message\', \'Files commited successfully.\')\n context.REQUEST.set(\'portal_status_message\', \'Files commited successfully.\')\n
context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Files%20commited%20successfully.\')\n context.REQUEST.set(\'do_extract\', \'False\')\n
#return context.BusinessTemplate_viewSvnStatus(do_extract=\'False\')\n return context.BusinessTemplate_viewSvnStatus()\n
]]></string> </value> ]]></string> </value>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment