[jan] Fix losing shared users when adding invalid user name (Bug #144…

…15).
horde · Jul 11, 2016 · 3a827c5 · 3a827c5
1 parent 837fe0f
commit 3a827c5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
@@ -3435,7 +3435,9 @@ KronolithCore = {
             var users = $F('kronolithC' + type + 'PUList').strip();
             users = users ? users.split(/,\s*/) : [];
             users.each(function(user) {
-                this.insertGroupOrUser(type, 'user', user, true);
+                if (!this.insertGroupOrUser(type, 'user', user, true)) {
+                    return;
+                }
                 $('kronolithC' + type + 'PUshow_' + user).setValue(1);
                 $('kronolithC' + type + 'PUread_' + user).setValue(1);
                 if ($F('kronolithC' + type + 'PUPerms') == 'edit') {
@@ -3492,7 +3494,9 @@ KronolithCore = {
             case 'groups':
                 if (!Object.isArray(perm.value)) {
                     $H(perm.value).each(function(group) {
-                        this.insertGroupOrUser(type, 'group', group.key);
+                        if (!this.insertGroupOrUser(type, 'group', group.key)) {
+                            return;
+                        }
                         if (!$('kronolithC' + type + 'PGshow_' + group.key)) {
                             // Group doesn't exist anymore.
                             delete perm.value[group.key];
@@ -3515,7 +3519,9 @@ KronolithCore = {
                 if (!Object.isArray(perm.value)) {
                     $H(perm.value).each(function(user) {
                         if (system || user.key != Kronolith.conf.user) {
-                            this.insertGroupOrUser(type, 'user', user.key);
+                            if (!this.insertGroupOrUser(type, 'user', user.key)) {
+                                return;
+                            }
                             if (!$('kronolithC' + type + 'PUshow_' + user.key)) {
                                 // User doesn't exist anymore.
                                 delete perm.value[user.key];
@@ -3707,6 +3713,8 @@ KronolithCore = {
      *                             Defaults to the value of the drop down.
      * @param stay_basic boolean   Enforces to NOT switch to the advanced
      *                             permissions screen.
+     *
+     * @return boolean  Whether a row has been inserted.
      */
     insertGroupOrUser: function(type, what, id, stay_basic)
     {
@@ -3716,7 +3724,10 @@ KronolithCore = {
         }
         var value = elm.getValue();
         if (!value) {
-            return;
+            if (id) {
+                HordeCore.notify(Kronolith.text.invalid_user + ': ' + id, 'horde.error');
+            }
+            return false;
         }
 
         var tr = elm.up('tr'),
@@ -3745,6 +3756,8 @@ KronolithCore = {
         if (!stay_basic) {
             this.activateAdvancedPerms(type);
         }
+
+        return true;
     },
 
     /**

diff --git a/kronolith/lib/Ajax.php b/kronolith/lib/Ajax.php
@@ -155,6 +155,7 @@ protected function _addBaseVars()
             'geocode_error' => _("Unable to locate requested address"),
             'hidelog' => _("Hide Notifications"),
             'import_warning' => _("Importing calendar data. This may take a while..."),
+            'invalid_user' => _("User does not exist"),
             'more' => _("more..."),
             'no_assignee' => _("None"),
             'no_calendar_title' => _("The calendar title must not be empty."),

diff --git a/kronolith/package.xml b/kronolith/package.xml
@@ -2786,6 +2786,8 @@
    <date>2016-07-01</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Fix losing shared users when adding invalid user name (Bug #14415).
+* [mjr] Fix displaying tag search results (Bug #14412).
 * [jan] Fix sender of event change notification messages.
    </notes>
   </release>