diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-03-02 16:35:17 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-03-08 17:13:49 +0100 |
| commit | ddcd37121fc88b43c4bd181625496663ae4fafe7 (patch) | |
| tree | 2154d141e38d656461eb85ddc8a8ccd47139a519 | |
| parent | 00122fa02704c2e7dc02fde172472167cf3ad42b (diff) | |
| download | nextcloud-server-ddcd37121fc88b43c4bd181625496663ae4fafe7.tar.gz nextcloud-server-ddcd37121fc88b43c4bd181625496663ae4fafe7.zip | |
Fix users loading on group click and group creation on select
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| -rw-r--r-- | settings/js/users/groups.js | 5 | ||||
| -rw-r--r-- | settings/js/users/users.js | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js index fdad763f871..08bd26b230e 100644 --- a/settings/js/users/groups.js +++ b/settings/js/users/groups.js @@ -18,6 +18,9 @@ GroupList = { filterGroups: false, addGroup: function (gid, displayName, usercount) { + if (_.isUndefined(displayName)) { + displayName = gid; + } var $li = $userGroupList.find('.isgroup:last-child').clone(); $li .data('gid', gid) @@ -142,7 +145,7 @@ GroupList = { function (result) { if (result.groupname) { var addedGroup = result.groupname; - UserList.availableGroups[result.id] = {displayName: result.groupName}; + UserList.availableGroups[groupid] = {displayName: result.groupname}; GroupList.addGroup(groupid, result.groupname); } GroupList.toggleAddGroup(); diff --git a/settings/js/users/users.js b/settings/js/users/users.js index 2db43b24a0b..1a20edd19d1 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -66,7 +66,7 @@ var UserList = { * } */ add: function (user) { - if (this.currentGid && this.currentGid !== '_everyone' && this.currentGid !== '_disabledUsers' && _.indexOf(user.groups, this.currentGid) < 0) { + if (this.currentGid && this.currentGid !== '_everyone' && this.currentGid !== '_disabledUsers' && Object.keys(user.groups).indexOf(this.currentGid) < 0) { return false; } @@ -454,7 +454,6 @@ var UserList = { if (!OC.isUserAdmin() && checked.length === 1 && checked[0] === group) { return false; } - if (add && OC.isUserAdmin() && _.isUndefined(UserList.availableGroups[group])) { GroupList.createGroup(group); if (_.isUndefined(UserList.availableGroups[group])) { |