Commit 0496d7e3 authored by lepdou's avatar lepdou

update

parent 219aff4a
...@@ -25,7 +25,12 @@ role_module.controller('AppRoleController', ...@@ -25,7 +25,12 @@ role_module.controller('AppRoleController',
$scope.assignMasterRoleToUser = function () { $scope.assignMasterRoleToUser = function () {
var toAssignMasterRoleUser = $('.' + $scope.userSelectWidgetId).select2('data')[0].id; var user = $('.' + $scope.userSelectWidgetId).select2('data')[0];
if (!user){
toastr.warning("请选择用户");
return;
}
var toAssignMasterRoleUser = user.id;
PermissionService.assign_master_role($scope.pageContext.appId, PermissionService.assign_master_role($scope.pageContext.appId,
toAssignMasterRoleUser) toAssignMasterRoleUser)
.then(function (result) { .then(function (result) {
......
...@@ -32,7 +32,12 @@ role_module.controller('NamespaceRoleController', ...@@ -32,7 +32,12 @@ role_module.controller('NamespaceRoleController',
$scope.assignRoleToUser = function (roleType) { $scope.assignRoleToUser = function (roleType) {
if ('ReleaseNamespace' == roleType) { if ('ReleaseNamespace' == roleType) {
var toAssignReleaseNamespaceRoleUser = $('.' + $scope.releaseRoleWidgetId).select2('data')[0].id; var user = $('.' + $scope.releaseRoleWidgetId).select2('data')[0];
if (!user){
toastr.warning("请选择用户");
return;
}
var toAssignReleaseNamespaceRoleUser = user.id;
PermissionService.assign_release_namespace_role($scope.pageContext.appId, PermissionService.assign_release_namespace_role($scope.pageContext.appId,
$scope.pageContext.namespaceName, $scope.pageContext.namespaceName,
toAssignReleaseNamespaceRoleUser) toAssignReleaseNamespaceRoleUser)
...@@ -44,7 +49,12 @@ role_module.controller('NamespaceRoleController', ...@@ -44,7 +49,12 @@ role_module.controller('NamespaceRoleController',
toastr.error(AppUtil.errorMsg(result), "添加失败"); toastr.error(AppUtil.errorMsg(result), "添加失败");
}); });
} else { } else {
var toAssignModifyNamespaceRoleUser = $('.' + $scope.modifyRoleWidgetId).select2('data')[0].id; var user = $('.' + $scope.modifyRoleWidgetId).select2('data')[0];
if (!user){
toastr.warning("请选择用户");
return;
}
var toAssignModifyNamespaceRoleUser = user.id;
PermissionService.assign_modify_namespace_role($scope.pageContext.appId, PermissionService.assign_modify_namespace_role($scope.pageContext.appId,
$scope.pageContext.namespaceName, $scope.pageContext.namespaceName,
toAssignModifyNamespaceRoleUser) toAssignModifyNamespaceRoleUser)
...@@ -93,7 +103,4 @@ role_module.controller('NamespaceRoleController', ...@@ -93,7 +103,4 @@ role_module.controller('NamespaceRoleController',
list.splice(index, 1); list.splice(index, 1);
} }
$scope.modifyRoleUsersId = 'J_modify_role_users';
$scope.releaseRoleUsersId = 'J_release_role_users';
}]); }]);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment