diff --git a/src/js/client.js b/src/js/client.js index 3b306263f..d73b1a006 100644 --- a/src/js/client.js +++ b/src/js/client.js @@ -699,10 +699,9 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N }).error(defaultErrorHandler(callback)); }; - Client.prototype.createGroup = function (name, roles, callback) { + Client.prototype.createGroup = function (name, callback) { var data = { - name: name, - roles: roles + name: name }; post('/api/v1/groups', data).success(function(data, status) { @@ -711,10 +710,9 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N }).error(defaultErrorHandler(callback)); }; - Client.prototype.updateGroup = function (id, name, roles, callback) { + Client.prototype.updateGroup = function (id, name, callback) { var data = { - name: name, - roles: roles + name: name }; post('/api/v1/groups/' + id, data).success(function(data, status) { diff --git a/src/views/users.html b/src/views/users.html index d40b0b113..8c8e9b9b1 100644 --- a/src/views/users.html +++ b/src/views/users.html @@ -175,26 +175,6 @@ {{ groupAdd.error.name }} - -
-
- -
- -
-
- -
-
- -
-
@@ -226,24 +206,6 @@ -
- -
- -
-
- -
-
- -
-
diff --git a/src/views/users.js b/src/views/users.js index 185d22bf2..18b45d702 100644 --- a/src/views/users.js +++ b/src/views/users.js @@ -236,11 +236,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio busy: false, error: {}, name: '', - roles: { - canManageUsers: false, - canManageApps: false, - canManageDomains: false, - }, show: function () { $scope.groupAdd.busy = false; @@ -258,12 +253,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $scope.groupAdd.busy = true; $scope.groupAdd.error = {}; - var roles = [ ]; - if ($scope.groupAdd.roles.canManageApps) roles.push('manage_apps'); - if ($scope.groupAdd.roles.canManageUsers) roles.push('manage_users'); - if ($scope.groupAdd.roles.canManageDomains) roles.push('manage_domains'); - - Client.createGroup($scope.groupAdd.name, roles, function (error) { + Client.createGroup($scope.groupAdd.name, function (error) { $scope.groupAdd.busy = false; if (error && error.statusCode === 409) { @@ -293,27 +283,12 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio name: '', selectedUsers: [], - roles: { - canManageUsers: false, - canManageApps: false, - canManageDomains: false, - }, - show: function (groupInfo) { $scope.groupEdit.error = {}; $scope.groupEdit.groupInfo = groupInfo; $scope.groupEdit.name = groupInfo.name; $scope.groupEdit.selectedUsers = groupInfo.userIds.map(function (uid) { return $scope.usersById[uid]; }); - for (var i = 0; i < groupInfo.roles.length; i++) { - switch (groupInfo.roles[i]) { - case 'manage_apps': $scope.groupEdit.roles.canManageApps = true; break; - case 'manage_users': $scope.groupEdit.roles.canManageUsers = true; break; - case 'manage_domains': $scope.groupEdit.roles.canManageDomains = true; break; - default: break; - } - } - $scope.groupEdit_form.$setPristine(); $scope.groupEdit_form.$setUntouched(); @@ -324,12 +299,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $scope.groupEdit.busy = true; $scope.groupEdit.error = {}; - var roles = [ ]; - if ($scope.groupEdit.roles.canManageApps) roles.push('manage_apps'); - if ($scope.groupEdit.roles.canManageUsers) roles.push('manage_users'); - if ($scope.groupEdit.roles.canManageDomains) roles.push('manage_domains'); - - Client.updateGroup($scope.groupEdit.groupInfo.id, $scope.groupEdit.name, roles, function (error) { + Client.updateGroup($scope.groupEdit.groupInfo.id, $scope.groupEdit.name, function (error) { if (error) { $scope.groupEdit.busy = false;