Эх сурвалжийг харах

[security] Create a new role with privileges and groups

Romain Rigaux 11 жил өмнө
parent
commit
2cbaa61

+ 2 - 2
apps/security/src/security/api/hive.py

@@ -83,7 +83,7 @@ def hive_create_role(request):
     result['privileges'] = _hive_add_privileges(request.user, role, role['privileges'])
     api.alter_sentry_role_add_groups(role['name'], role['groups'])
 
-    result['role'] = {"name": role['name'], "groups": [], "grantorPrincipal": request.user.username}
+    result['role'] = {"name": role['name'], "groups": role['groups'], "grantorPrincipal": request.user.username}
 
     result['message'] = ''
     result['status'] = 0
@@ -116,7 +116,7 @@ def create_sentry_role(request):
     roleName = request.POST['roleName']
 
     get_api(request.user).create_sentry_role(roleName)
-    result['message'] = ''
+    result['message'] = _('Role and privileges created.')
     result['status'] = 0
   except Exception, e:
     result['message'] = unicode(str(e), "utf8")

+ 1 - 7
apps/security/static/js/hive.ko.js

@@ -75,9 +75,7 @@ var Role = function(vm, role) {
       }, function (data) {
         if (data.status == 0) {
           $(document).trigger("info", data.message);
-          data.role['privileges'] = ko.observableArray();
-          data.role['showPrivileges'] = ko.observable(false);
-          vm.roles.unshift(data.role);
+          vm.roles.unshift(new Role(vm, data.role));
           self.reset();
           vm.showCreateRole(false);
         }
@@ -106,10 +104,6 @@ var Role = function(vm, role) {
     });
   }
 
-  /**self.addNewPrivilege = function(role) {
-    role['newPrivileges'].push(new Privilege(vm, {'serverName': vm.assist.server()}));
-  }*/
-
   self.saveNewPrivileges = function(role) {
 	$(".jHueNotify").hide();
     $.post("/security/api/hive/add_privileges", {