Browse Source

[security] Disable default ACLs on files

Enrico Berti 11 years ago
parent
commit
5a0ff29e7d
2 changed files with 14 additions and 9 deletions
  1. 10 9
      apps/security/src/security/templates/hdfs.mako
  2. 4 0
      apps/security/static/js/hdfs.ko.js

+ 10 - 9
apps/security/src/security/templates/hdfs.mako

@@ -175,15 +175,16 @@ ${ layout.menubar(section='hdfs') }
                         <span class="pointer" data-bind="visible: $root.assist.changedRegularAcls().length, click: $root.assist.updateAcls"> &nbsp; <i class="fa fa-save"></i></span>
                       </div>
 
-                      <h4>${ _('Default ACLs') }</h4>
-                      <div data-bind="foreach: $root.assist.defaultAcls">
-                        <div data-bind="template: {name: 'aclEdit'}"></div>
-                      </div>
-
-                      <div class="acl-block acl-actions">
-                        <span class="pointer" data-bind="click: $root.assist.addDefaultAcl"><i class="fa fa-plus"></i></span>
-                        <span class="pointer" data-bind="visible: $root.assist.defaultAcls().length, click: $root.assist.getAcls"> &nbsp; <i class="fa fa-undo"></i></span>
-                        <span class="pointer" data-bind="visible: $root.assist.defaultAcls().length, click: $root.assist.updateAcls"> &nbsp; <i class="fa fa-save"></i></span>
+                      <div data-bind="visible: $root.assist.pathType() == 'dir'">
+                        <h4>${ _('Default ACLs') }</h4>
+                        <div data-bind="foreach: $root.assist.defaultAcls">
+                          <div data-bind="template: {name: 'aclEdit'}"></div>
+                        </div>
+                        <div class="acl-block acl-actions">
+                          <span class="pointer" data-bind="click: $root.assist.addDefaultAcl"><i class="fa fa-plus"></i></span>
+                          <span class="pointer" data-bind="visible: $root.assist.defaultAcls().length, click: $root.assist.getAcls"> &nbsp; <i class="fa fa-undo"></i></span>
+                          <span class="pointer" data-bind="visible: $root.assist.defaultAcls().length, click: $root.assist.updateAcls"> &nbsp; <i class="fa fa-save"></i></span>
+                        </div>
                       </div>
                     </span>
                   </div>

+ 4 - 0
apps/security/static/js/hdfs.ko.js

@@ -115,6 +115,7 @@ var Assist = function (vm, assist) {
     self.fetchPath();
     window.location.hash = path;
   });
+  self.pathType = ko.observable('');
   self.recursive = ko.observable(false);
   self.pagenum = ko.observable(1);
   self.fromLoadMore = false;
@@ -405,15 +406,18 @@ var Assist = function (vm, assist) {
         function (data) {
           if (data.error != null && data.error == "FILE_NOT_FOUND") {
             self.path("/");
+            self.pathType("dir");
           }
           else {
             self.loadParents(data.breadcrumbs);
             if (data['files'] && data['files'][0] && data['files'][0]['type'] == 'dir') { // Hack for now
+              self.pathType("dir");
               $.each(data.files, function (index, item) {
                 self.convertItemToObject(item);
               });
             }
             else {
+              self.pathType("file");
               self.convertItemToObject(data);
             }
             self.getTreeAdditionalDataForPath(_path).loaded = true;