[Erp5-report] r24790 - in /erp5/trunk/bt5/erp5_forge: SkinTemplateItem/portal_skins/erp5_sv...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Dec  4 11:36:04 2008
New Revision: 24790

URL: http://svn.erp5.org?rev=24790&view=rev
Log:
after a checkin, display revision number in portal status message

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=24790&r1=24789&r2=24790&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] Thu Dec  4 11:36:04 2008
@@ -95,11 +95,24 @@
   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 @@
 \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 @@
                             <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>

Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=24790&r1=24789&r2=24790&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision [utf8] Thu Dec  4 11:36:04 2008
@@ -1,1 +1,1 @@
-413
+414