svn: /web/doc-editor/trunk/js/ locale/fr.js ui/task/VCSCommitTask.js

yannick                                  Sun, 22 Nov 2009 22:42:54 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=291161

Log:
Add warning message when we try to commit a file without log message

Changed paths:
    U   web/doc-editor/trunk/js/locale/fr.js
    U   web/doc-editor/trunk/js/ui/task/VCSCommitTask.js

Modified: web/doc-editor/trunk/js/locale/fr.js
===================================================================
--- web/doc-editor/trunk/js/locale/fr.js	2009-11-22 22:21:24 UTC (rev 291160)
+++ web/doc-editor/trunk/js/locale/fr.js	2009-11-22 22:42:54 UTC (rev 291161)
@@ -10,6 +10,9 @@

 // Generic

+i18n["Error"] = "Erreur";
+i18n["The log message is required."] = "Le message pour l'historique est obligatoire.";
+
 i18n["Log"] = "Journal";
 i18n["Cancel this deletion"] = "Annuler cette suppression";
 i18n["anonymous"] = "Utilisateur anonyme";

Modified: web/doc-editor/trunk/js/ui/task/VCSCommitTask.js
===================================================================
--- web/doc-editor/trunk/js/ui/task/VCSCommitTask.js	2009-11-22 22:21:24 UTC (rev 291160)
+++ web/doc-editor/trunk/js/ui/task/VCSCommitTask.js	2009-11-22 22:42:54 UTC (rev 291161)
@@ -7,7 +7,7 @@
         _('Please, wait until commit...')
     );

-    var nodes = [], node, LogMessage;
+    var nodes = [], node, LogMessage, tmp;

     // Go for VCS commit
     for (var i = 0; i < files.length; i = i + 1) {
@@ -19,6 +19,22 @@
     // Get log message
     LogMessage = Ext.getCmp('form-commit-message-log').getValue();

+    // The LogMessage is required
+    LogMessage = String.trim(LogMessage);
+
+    if( Ext.isEmpty(LogMessage) ) {
+
+        Ext.getBody().unmask();
+
+        Ext.getCmp('form-commit-message-log').markInvalid(_('The log message is required.'));
+
+        Ext.MessageBox.alert(
+            _('Error'),
+            _('The log message is required.')
+        );
+        return;
+    }
+
     // Close this window
     Ext.getCmp('winVCSCommit').close();

@@ -30,7 +46,8 @@
         },
         success : function(response)
         {
-            var o = Ext.util.JSON.decode(response.responseText), tmp;
+            var o = Ext.util.JSON.decode(response.responseText),
+                tmp;

             Ext.getBody().unmask();