diff options
| author | blizzz <blizzz@owncloud.com> | 2014-07-15 19:10:01 +0200 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2014-07-15 19:10:01 +0200 |
| commit | d22904612b6c76fd05d677ac4aa054500df30f11 (patch) | |
| tree | 70fb9b5f498552ba9ba24bc60ae0bae186dd1d0a /settings | |
| parent | bf657883d29c132159994ed5e8eb66b07f7473e5 (diff) | |
| parent | cd97847cd686b5d894cf9c4ab0e21373cd4f6ba1 (diff) | |
| download | nextcloud-server-d22904612b6c76fd05d677ac4aa054500df30f11.tar.gz nextcloud-server-d22904612b6c76fd05d677ac4aa054500df30f11.zip | |
Merge pull request #9628 from edozzo/master
Userlist: async load doesnt fill checked group/subadmin array
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/users/users.js | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/settings/js/users/users.js b/settings/js/users/users.js index 7d567e225d9..ba228905a8a 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -365,7 +365,12 @@ var UserList = { var user = UserList.getUID($element); if ($element.data('user-groups')) { - checked = $element.data('user-groups'); + if (typeof $element.data('user-groups') === 'string') { + checked = $element.data('user-groups').split(", "); + } + else { + checked = $element.data('user-groups'); + } } var checkHandler = null; if(user) { // Only if in a user row, and not the #newusergroups select @@ -445,7 +450,12 @@ var UserList = { var user = UserList.getUID($element); if ($element.data('subadmin')) { - checked = $element.data('subadmin'); + if (typeof $element.data('subadmin') === 'string') { + checked = $element.data('subadmin').split(", "); + } + else { + checked = $element.data('subadmin'); + } } var checkHandler = function (group) { if (group === 'admin') { |