jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Revert role support

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-07-26 11:38:20 -07:00
parent be86a3022f
commit 54103ca120
3 changed files with 6 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/views/users.js
View File

@@ -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;