From 2012feb49d03dd7268270011073ffb53877b9fa5 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Mon, 16 May 2022 20:41:27 +0500 Subject: [PATCH] bug fix: file manager --- filemanager/static/filemanager/js/fileManager.js | 8 +++++--- static/filemanager/js/fileManager.js | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/filemanager/static/filemanager/js/fileManager.js b/filemanager/static/filemanager/js/fileManager.js index 0f41ae271..26adccfc2 100755 --- a/filemanager/static/filemanager/js/fileManager.js +++ b/filemanager/static/filemanager/js/fileManager.js @@ -674,7 +674,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, var data = { completeStartingPath: completePathToFile, method: "listForTable", - home: homePathBack, + home: "/", domainRandomSeed: domainRandomSeed, domainName: domainName }; @@ -1201,9 +1201,11 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, pathbase = $scope.currentPath; } + + $scope.extractionLoading = false; - var completeFileToExtract = $scope.currentRPath + "/" + allFilesAndFolders[0]; + var completeFileToExtract = pathbase + "/" + allFilesAndFolders[0]; var extractionType = ""; if (findFileExtension(completeFileToExtract) == "gz") { @@ -1825,4 +1827,4 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, }; -}); \ No newline at end of file +}); diff --git a/static/filemanager/js/fileManager.js b/static/filemanager/js/fileManager.js index 0f41ae271..26adccfc2 100644 --- a/static/filemanager/js/fileManager.js +++ b/static/filemanager/js/fileManager.js @@ -674,7 +674,7 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, var data = { completeStartingPath: completePathToFile, method: "listForTable", - home: homePathBack, + home: "/", domainRandomSeed: domainRandomSeed, domainName: domainName }; @@ -1201,9 +1201,11 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, pathbase = $scope.currentPath; } + + $scope.extractionLoading = false; - var completeFileToExtract = $scope.currentRPath + "/" + allFilesAndFolders[0]; + var completeFileToExtract = pathbase + "/" + allFilesAndFolders[0]; var extractionType = ""; if (findFileExtension(completeFileToExtract) == "gz") { @@ -1825,4 +1827,4 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, }; -}); \ No newline at end of file +});