From cdf370e08f165c42daf862d0caee788d46fd4660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Thu, 4 Dec 2008 10:36:04 +0000 Subject: [PATCH] after a checkin, display revision number in portal status message git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24790 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_svn/BusinessTemplate_doSvnCommit.xml | 24 ++++++++++++++++--- bt5/erp5_forge/bt/revision | 2 +- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml index be5ab4b888..4081ab0a4d 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml @@ -95,11 +95,24 @@ if changelog.strip() == \'\' :\n 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 \n +def getRevisionNumber(revision):\n + """get the revision number from a revision, with backward compatibility support.\n + """\n + if hasattr(revision, \'getNumber\'):\n + return revision.getNumber()\n + return str(revision)\n +\n try:\n + revision_string = \'\'\n if commit_non_recurs != \'none\' and commit_non_recurs != \'\':\n - context.getPortalObject()["portal_subversion"].checkin(path=commit_non_recurs, business_template=context, recurse=False, log_message=changelog)\n + revision = context.getPortalObject()["portal_subversion"].checkin(path=commit_non_recurs, business_template=context, recurse=False, log_message=changelog)\n + revision_string = \'%s\' % getRevisionNumber(revision)\n if commit_recurs != \'none\' and commit_recurs != \'\':\n - context.getPortalObject()["portal_subversion"].checkin(path=commit_recurs, business_template=context, recurse=True, log_message=changelog)\n + revision = context.getPortalObject()["portal_subversion"].checkin(path=commit_recurs, business_template=context, recurse=True, log_message=changelog)\n + if revision_string:\n + revision_string = \'%s, %s\' % (revision_string, getRevisionNumber(revision))\n + else:\n + revision_string = \'%s\' % getRevisionNumber(revision)\n except SubversionSSLTrustError, error:\n request.set(\'portal_status_message\', \'SSL Certificate was not recognized\')\n request.set(\'cancel_url\', context.absolute_url() + \'/BusinessTemplate_viewSvnStatus?do_extract=False&portal_status_message=Commit%20cancelled.\')\n @@ -111,7 +124,8 @@ except SubversionLoginError, error1 :\n \n return request.RESPONSE.redirect(\'%s/view?%s\' % (\n context.absolute_url(),\n - make_query(portal_status_message=translateString(\'Files commited successfully.\'))))\n + make_query(portal_status_message=translateString(\'Files commited successfully in revision ${revision}.\',\n + mapping=dict(revision=revision_string)))))\n ]]></string> </value> @@ -171,10 +185,14 @@ return request.RESPONSE.redirect(\'%s/view?%s\' % (\n <string>context</string> <string>commit_recurs</string> <string>None</string> + <string>getRevisionNumber</string> + <string>revision_string</string> <string>False</string> + <string>revision</string> <string>True</string> <string>error</string> <string>error1</string> + <string>dict</string> </tuple> </value> </item> diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision index 5c9fe11c04..511fa83dfa 100644 --- a/bt5/erp5_forge/bt/revision +++ b/bt5/erp5_forge/bt/revision @@ -1 +1 @@ -413 \ No newline at end of file +414 \ No newline at end of file -- 2.30.9