瀏覽代碼

[security] Call refresh tree when switching diff mode or user

Romain Rigaux 11 年之前
父節點
當前提交
0acd8d1ed3
共有 2 個文件被更改,包括 13 次插入10 次删除
  1. 3 3
      apps/security/src/security/templates/hdfs.mako
  2. 10 7
      apps/security/static/js/hdfs.ko.js

+ 3 - 3
apps/security/src/security/templates/hdfs.mako

@@ -176,14 +176,14 @@ ${ layout.menubar(section='hdfs') }
                 <div class="tree-toolbar">
                   <div class="pull-right">
                     <a href="javascript: void(0)" data-bind="click: function() { $root.assist.isDiffMode(false); }" title="${ _('Show non accessible files') }">
-                      <i class="fa fa-eye" data-bind="visible: $root.assist.isDiffMode"></i>
+                      <i class="fa fa-eye-slash" data-bind="visible: $root.assist.isDiffMode"></i>
                     </a>
                     <a href="javascript: void(0)" data-bind="click: function() { $root.assist.isDiffMode(true); }" title="${ _('Show as the user would see') }">
-                      <i class="fa fa-eye-slash" data-bind="visible: ! $root.assist.isDiffMode()"></i>
+                      <i class="fa fa-eye" data-bind="visible: ! $root.assist.isDiffMode()"></i>
                     </a>
                     ${ _('View as') }
                     <input type="text" class="user-list input-small" data-bind="value: $root.doAs">
-                      <i class="fa fa-group"></i>
+                    <i class="fa fa-group" title="List of groups in popover for this user?"></i>
                   </div>
                   <i class="fa fa-sitemap fa-rotate-270"></i>
                   <a href="javascript: void(0)" data-bind="click: $root.assist.collapseTree">

+ 10 - 7
apps/security/static/js/hdfs.ko.js

@@ -63,6 +63,9 @@ var Assist = function (vm, assist) {
   self.isLoadingAcls = ko.observable(false);
   self.showAclsAsText = ko.observable(false);
   self.isDiffMode = ko.observable(false);
+  self.isDiffMode.subscribe(function () {
+    self.refreshTree();
+  });
 
   self.treeAdditionalData = {};
   self.treeData = ko.observable({nodes: []});
@@ -322,13 +325,13 @@ var Assist = function (vm, assist) {
   self.getAcls = function () {
     $(".jHueNotify").hide();
     var _isLoading = window.setTimeout(function () {
-      self.isLoadingAcls(true);
-    }, 1000);
-    logGA('get_acls');
+        self.isLoadingAcls(true);
+      }, 1000);
+        logGA('get_acls');
 
-    $.getJSON('/security/api/hdfs/get_acls', {
-      'path': self.path()
-    }, function (data) {
+        $.getJSON('/security/api/hdfs/get_acls', {
+        'path': self.path()
+      }, function (data) {
       window.clearTimeout(_isLoading);
       if (data != null) {
         self.acls.removeAll();
@@ -386,7 +389,7 @@ var HdfsViewModel = function (initial) {
 
   self.doAs = ko.observable(initial.user);
   self.doAs.subscribe(function () {
-    self.assist.fetchPath();
+	self.assist.refreshTree();
   });
   self.availableHadoopUsers = ko.observableArray();
   self.availableHadoopGroups = ko.observableArray();