From: Jan Schneider <jan@horde.org>
Date: Fri, 18 Jun 2010 17:15:57 +0000 (+0200)
Subject: Don't allow empty calendar titles.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3b0af4c01f975a9861fc7506d09caa7797ef077e;p=horde.git

Don't allow empty calendar titles.
---

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
index ac2c890f1..e2a8ee469 100644
--- a/kronolith/js/kronolith.js
+++ b/kronolith/js/kronolith.js
@@ -217,7 +217,7 @@ KronolithCore = {
             case 'horde.message':
             case 'horde.success':
                 this.Growler.growl(
-                    m.flags.include('content.raw')
+                    m.flags && m.flags.include('content.raw')
                         ? m.message.replace(new RegExp('<a href="([^"]+)"'), '<a href="#" onclick="KronolithCore.iframeContent(\'$1\')"')
                         : m.message.escapeHTML(),
                     {
@@ -3282,12 +3282,20 @@ KronolithCore = {
      * Submits the calendar form to save the calendar data.
      *
      * @param Element form  The form node.
+     *
+     * @return boolean  Whether the save request was successfully sent.
      */
     saveCalendar: function(form)
     {
         var data = form.serialize({ hash: true });
+        if (data.name.empty()) {
+            this.showNotifications([ { type: 'horde.warning', message: data.type == 'tasklists' ? Kronolith.text.no_tasklist_title : Kronolith.text.no_calendar_title }]);
+            $('kronolithCalendar' + data.type + 'Name').focus();
+            return false;
+        }
         this.doAction('saveCalendar', data,
                       this.saveCalendarCallback.bind(this, form, data));
+        return true;
     },
 
     /**
@@ -3716,7 +3724,11 @@ KronolithCore = {
                 case 'kronolithCalendarFormtasklists':
                 case 'kronolithCalendarFormremote':
                     // Disabled for now, we have to also catch Continue buttons.
-                    //this.saveCalendar(form);
+                    //var saveButton = form.down('.kronolithCalendarSave');
+                    //saveButton.disable();
+                    //if (!this.saveCalendar(form)) {
+                    //    saveButton.enable();
+                    //}
                     //e.stop();
                     break;
                 }
@@ -4295,7 +4307,9 @@ KronolithCore = {
                 return;
             } else if (elt.hasClassName('kronolithCalendarSave')) {
                 elt.disable();
-                this.saveCalendar(elt.up('form'));
+                if (!this.saveCalendar(elt.up('form'))) {
+                    elt.enable();
+                }
                 e.stop();
                 break;
             } else if (elt.hasClassName('kronolithCalendarContinue')) {
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 123a71c5e..d499c116e 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -365,6 +365,8 @@ class Kronolith
             'prefs' => _("Options"),
             'shared' => _("Shared"),
             'no_url' => _("You must specify a URL."),
+            'no_calendar_title' => _("The calendar title must not be empty."),
+            'no_tasklist_title' => _("The task list title must not be empty."),
             'wrong_auth' => _("The authentication information you specified wasn't accepted."),
             'geocode_error' => _("Unable to locate requested address"),
             'wrong_date_format' => sprintf(_("You used an unknown date format \"%s\". Please try something like \"%s\"."), '#{wrong}', '#{right}'),