소스 검색

[security] Show previously expanded roles after a Role add or remove operation

Enrico Berti 11 년 전
부모
커밋
6876b8e
2개의 변경된 파일6개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 0
      apps/security/src/security/templates/hive.mako
  2. 3 2
      apps/security/static/js/hive.ko.js

+ 3 - 0
apps/security/src/security/templates/hive.mako

@@ -500,6 +500,9 @@ ${ tree.import_templates(itemClick='$root.assist.setPath', iconClick='$root.assi
 
       $(document).on("created.role", function(){
         $("#createRoleModal").modal("hide");
+        window.setTimeout(function(){
+          viewModel.refreshExpandedRoles();
+        }, 500);
       });
 
       $(document).on("deleted.role", function(){

+ 3 - 2
apps/security/static/js/hive.ko.js

@@ -238,11 +238,11 @@ var Role = function (vm, role) {
         $(document).trigger("info", data.message);
         vm.showCreateRole(false);
         self.reset();
-        $(document).trigger("created.role");
         var role = new Role(vm, data.role);
         vm.originalRoles.unshift(role);
         vm.assist.refreshTree();
         vm.refreshExpandedRoles();
+        $(document).trigger("created.role");
       } else {
         $(document).trigger("error", data.message);
       }
@@ -260,9 +260,9 @@ var Role = function (vm, role) {
         $(document).trigger("info", data.message);
         vm.showCreateRole(false);
         self.reset();
-        $(document).trigger("updated.role");
         vm.assist.refreshTree();
         vm.refreshExpandedRoles();
+        $(document).trigger("updated.role");
       } else {
         $(document).trigger("error", data.message);
       }
@@ -279,6 +279,7 @@ var Role = function (vm, role) {
       if (data.status == 0) {
         vm.removeRole(role.name());
         vm.assist.refreshTree();
+        $(document).trigger("removed.role");
       } else {
         $(document).trigger("error", data.message);
       }