diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-03-05 16:16:43 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-03-08 17:13:51 +0100 |
| commit | 6e0044b668b8eb99c7dfc5c47e6b8f9c9f23298c (patch) | |
| tree | 4d432e069b19eb5ef53a23f23a6a17cab1e4bcad /apps | |
| parent | 51ec928623fe5d2aa0b010546f59807513c32052 (diff) | |
| download | nextcloud-server-6e0044b668b8eb99c7dfc5c47e6b8f9c9f23298c.tar.gz nextcloud-server-6e0044b668b8eb99c7dfc5c47e6b8f9c9f23298c.zip | |
Fixed sharing groups select and fixed search
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/workflowengine/js/admin.js | 7 | ||||
| -rw-r--r-- | apps/workflowengine/js/usergroupmembershipplugin.js | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/apps/workflowengine/js/admin.js b/apps/workflowengine/js/admin.js index d31add77ef4..891e50c4189 100644 --- a/apps/workflowengine/js/admin.js +++ b/apps/workflowengine/js/admin.js @@ -167,7 +167,7 @@ url: OC.generateUrl('settings/users/groups'), dataType: 'json', quietMillis: 100, - }).done(function(response) { + }).success(function(response) { // add admin groups $.each(response.data.adminGroups, function(id, group) { self.groups.push({ id: group.id, displayname: group.name }); @@ -177,8 +177,9 @@ self.groups.push({ id: group.id, displayname: group.name }); }); self.render(); - }).fail(function(response) { - console.error('Failure happened', response); + }).error(function(data) { + OC.Notification.error(t('workflowengine', 'Unable to retrieve the group list'), {type: 'error'}); + console.log(data); }); }, delete: function() { diff --git a/apps/workflowengine/js/usergroupmembershipplugin.js b/apps/workflowengine/js/usergroupmembershipplugin.js index c664481562b..b89087bea06 100644 --- a/apps/workflowengine/js/usergroupmembershipplugin.js +++ b/apps/workflowengine/js/usergroupmembershipplugin.js @@ -42,7 +42,7 @@ $(element).css('width', '400px'); $(element).select2({ - data: groups, + data: { results: groups, text: 'displayname' }, initSelection: function (element, callback) { var groupId = element.val(); if (groupId && groups.length > 0) { |