From 2b5eaf154405b17106f1d87c774f34247894c033 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <christophe@nexedi.com>
Date: Wed, 12 Apr 2006 15:20:53 +0000
Subject: [PATCH] Force user to set a changelog (asked by Aurelien)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6562 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml  | 7 ++++++-
 .../SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml  | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml
index 2700c5470e..bb20c12358 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml
@@ -68,7 +68,7 @@
             <key> <string>_body</string> </key>
             <value> <string>from Products.ERP5Subversion.SubversionClient import SubversionSSLTrustError, SubversionLoginError\n
 \n
-if "changelog" in context.REQUEST.keys() and context.REQUEST["changelog"]!=\'\':\n
+if "changelog" in context.REQUEST.keys() and context.REQUEST["changelog"].strip()!=\'\':\n
   changelog=context.REQUEST["changelog"]\n
 else:\n
   changelog=None\n
@@ -95,6 +95,11 @@ if svn_path[-1]!=\'/\':\n
   svn_path+=\'/\'\n
 \n
 if \'changelog\' not in context.REQUEST.keys() :\n
+  context.REQUEST.set(\'portal_status_message\', \'Please set a changelog message...\')\n
+  return context.asContext(added=added, modified=modified, removed=removed ,checked=checked).BusinessTemplate_viewSvnChangelog()\n
+\n
+if not changelog :\n
+  context.REQUEST.set(\'portal_status_message\', "Error: Changelog Message can\'t be empty!")\n
   return context.asContext(added=added, modified=modified, removed=removed ,checked=checked).BusinessTemplate_viewSvnChangelog()\n
 \n
 try:\n
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml
index fccb7ff3ef..bdb8ca1c44 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml
@@ -66,7 +66,10 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>to_revert = files.split(\',\')\n
+            <value> <string>if files != \'none\' and files !=\'\':\n
+  to_revert = files.split(\',\')\n
+else:\n
+  to_revert = files\n
 \n
 svn_path = context.getPortalObject().portal_preferences.getPreference(\'subversion_working_copy\')\n
 if not svn_path :\n
-- 
2.30.9