Parcourir la source

[security] Improved striked path

Enrico Berti il y a 11 ans
Parent
commit
c81aed8
2 fichiers modifiés avec 10 ajouts et 4 suppressions
  1. 1 1
      apps/security/src/security/api/hdfs.py
  2. 9 3
      apps/security/static/js/hdfs.ko.js

+ 1 - 1
apps/security/src/security/api/hdfs.py

@@ -54,7 +54,7 @@ def list_hdfs(request, path):
     else:
       json_response = display(request, path)
   except:
-    json_response = HttpResponse(json.dumps({'files': []}), mimetype="application/json") # AccessControlException: Permission denied: user=test, access=READ_EXECUTE, inode="/tmp/dir":romain:supergroup:drwxr-xr-x:group::r-x,group:bob:---,group:test:---,default:user::rwx,default:group::r--,default:mask::r--,default:other::rwx (error 403)
+    json_response = HttpResponse(json.dumps({'files': [], 'page': {}}), mimetype="application/json") # AccessControlException: Permission denied: user=test, access=READ_EXECUTE, inode="/tmp/dir":romain:supergroup:drwxr-xr-x:group::r-x,group:bob:---,group:test:---,default:user::rwx,default:group::r--,default:mask::r--,default:other::rwx (error 403)
 
   if json.loads(request.GET.get('isDiffMode', 'false')):
     request.doas = 'hdfs'

+ 9 - 3
apps/security/static/js/hdfs.ko.js

@@ -168,7 +168,7 @@ var Assist = function (vm, assist) {
   };
 
   self.convertItemToObject = function (item) {
-    if (item.path != null) {
+    if (item.path != null && item.name != "." && item.name != "..") {
       var _path = item.path;
       var _parent = _path.substr(0, _path.lastIndexOf("/"));
       if (_parent == "") {
@@ -326,7 +326,11 @@ var Assist = function (vm, assist) {
             path: crumb.url,
             name: crumb.label,
             rwx: "",
-            isDir: true
+            isDir: true,
+            page: {
+              number: -1,
+              num_pages: -1
+            }
           }
           self.convertItemToObject(_item);
         }
@@ -355,7 +359,9 @@ var Assist = function (vm, assist) {
           self.convertItemToObject(data);
         }
         self.getTreeAdditionalDataForPath(_path).loaded = true;
-        self.updatePathProperty(self.growingTree(), _path, "page", data.page);
+        if (data.page != null && data.page.number != null){
+          self.updatePathProperty(self.growingTree(), _path, "page", data.page);
+        }
         if (typeof loadCallback != "undefined"){
           loadCallback(data);
         }