Просмотр исходного кода

[sentry] List privileges of the server

Enrico Berti 11 лет назад
Родитель
Сommit
5906e84fc9

+ 1 - 1
apps/security/src/security/templates/hive.mako

@@ -601,7 +601,7 @@ ${ tree.import_templates(itemClick='$root.assist.setPath', iconClick='$root.assi
         $("#createRoleModal").modal("hide");
         $("#grantPrivilegeModal").modal("hide");
         $("#deletePrivilegeModal").modal("hide");
-        viewModel.clear_temp_roles();
+        viewModel.clearTempRoles();
         window.setTimeout(function(){
           viewModel.refreshExpandedRoles();
         }, 500);

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

@@ -553,7 +553,7 @@ var Assist = function (vm, initial) {
     vm.list_sentry_privileges_by_authorizable();
   }
 
-  self.setPath = function (obj, toggle) {
+  self.setPath = function (obj, toggle, skipListAuthorizable) {
     if (self.getTreeAdditionalDataForPath(obj.path()).loaded || (!obj.isExpanded() && !self.getTreeAdditionalDataForPath(obj.path()).loaded)) {
       if (typeof toggle == "boolean" && toggle) {
         obj.isExpanded(!obj.isExpanded());
@@ -575,7 +575,9 @@ var Assist = function (vm, initial) {
     $(document).trigger("changed.path");
 
     if (self.getTreeAdditionalDataForPath(obj.path()).loaded){
-      vm.list_sentry_privileges_by_authorizable();
+      if (typeof skipListAuthorizable == "undefined" || !skipListAuthorizable) {
+        vm.list_sentry_privileges_by_authorizable();
+      }
     }
     else {
       self.fetchHivePath();
@@ -704,7 +706,7 @@ var Assist = function (vm, initial) {
           if (data.databases) {
             self.addDatabases(_originalPath, data.databases, _hasCallback);
             if (vm.getPathHash() == ""){
-              self.setPath(self.treeData().nodes()[0]);
+              self.setPath(self.treeData().nodes()[0], false, true);
             }
           }
           else if (data.tables && data.tables.length > 0) {