diff options
Diffstat (limited to 'settings/js/users/groups.js')
| -rw-r--r-- | settings/js/users/groups.js | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js index 081842734f0..c06bc5ff14b 100644 --- a/settings/js/users/groups.js +++ b/settings/js/users/groups.js @@ -84,29 +84,24 @@ GroupList = { createGroup: function (groupname) { $.post( - OC.filePath('settings', 'ajax', 'creategroup.php'), + OC.generateUrl('/settings/users/groups'), { - groupname: groupname + id: groupname }, function (result) { - if (result.status !== 'success') { - OC.dialogs.alert(result.data.message, - t('settings', 'Error creating group')); + if (result.groupname) { + var addedGroup = result.groupname; + UserList.availableGroups = $.unique($.merge(UserList.availableGroups, [addedGroup])); + GroupList.addGroup(result.groupname); + + $('.groupsselect, .subadminsselect') + .append($('<option>', { value: result.groupname }) + .text(result.groupname)); } - else { - if (result.data.groupname) { - var addedGroup = result.data.groupname; - UserList.availableGroups = $.unique($.merge(UserList.availableGroups, [addedGroup])); - GroupList.addGroup(result.data.groupname); - - $('.groupsselect, .subadminsselect') - .append($('<option>', { value: result.data.groupname }) - .text(result.data.groupname)); - } - GroupList.toggleAddGroup(); - } - } - ); + GroupList.toggleAddGroup(); + }).fail(function(result, textStatus, errorThrown) { + OC.dialogs.alert(result.responseJSON.message, t('settings', 'Error creating group')); + }); }, update: function () { @@ -115,7 +110,7 @@ GroupList = { } GroupList.updating = true; $.get( - OC.generateUrl('/settings/ajax/grouplist'), + OC.generateUrl('/settings/users/groups'), { pattern: filter.getPattern(), filterGroups: filter.filterGroups ? 1 : 0 @@ -221,7 +216,7 @@ GroupList = { }, initDeleteHandling: function () { //set up handler - GroupDeleteHandler = new DeleteHandler('removegroup.php', 'groupname', + GroupDeleteHandler = new DeleteHandler('/settings/users/groups', 'groupname', GroupList.hide, GroupList.remove); //configure undo |