From 0496d7e37a78650feaf8368cc3454f5e3086e801 Mon Sep 17 00:00:00 2001
From: lepdou <lepdou@126.com>
Date: Mon, 27 Jun 2016 17:55:55 +0800
Subject: [PATCH] update

---
 .../controller/role/AppRoleController.js        |  7 ++++++-
 .../controller/role/NamespaceRoleController.js  | 17 ++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/apollo-portal/src/main/resources/static/scripts/controller/role/AppRoleController.js b/apollo-portal/src/main/resources/static/scripts/controller/role/AppRoleController.js
index b77ba7291..b2d8fb00c 100644
--- a/apollo-portal/src/main/resources/static/scripts/controller/role/AppRoleController.js
+++ b/apollo-portal/src/main/resources/static/scripts/controller/role/AppRoleController.js
@@ -25,7 +25,12 @@ role_module.controller('AppRoleController',
 
 
                             $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,
                                                                      toAssignMasterRoleUser)
                                     .then(function (result) {
diff --git a/apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.js b/apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.js
index 2538b1abc..12a540390 100644
--- a/apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.js
+++ b/apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.js
@@ -32,7 +32,12 @@ role_module.controller('NamespaceRoleController',
 
                             $scope.assignRoleToUser = function (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,
                                                                                     $scope.pageContext.namespaceName,
                                                                                     toAssignReleaseNamespaceRoleUser)
@@ -44,7 +49,12 @@ role_module.controller('NamespaceRoleController',
                                             toastr.error(AppUtil.errorMsg(result), "添加失败");
                                         });
                                 } 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,
                                                                                    $scope.pageContext.namespaceName,
                                                                                    toAssignModifyNamespaceRoleUser)
@@ -93,7 +103,4 @@ role_module.controller('NamespaceRoleController',
                                 list.splice(index, 1);
                             }
                             
-                            $scope.modifyRoleUsersId = 'J_modify_role_users';
-                            $scope.releaseRoleUsersId = 'J_release_role_users';
-
                         }]);
-- 
GitLab