From 625583774dbc4248f7367932792d248e2a148740 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Fri, 9 Sep 2022 09:36:10 +0500 Subject: [PATCH] bug fix: main file manager --- filemanager/static/filemanager/js/fileManager.js | 13 ++++++++----- filemanager/templates/filemanager/index.html | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/filemanager/static/filemanager/js/fileManager.js b/filemanager/static/filemanager/js/fileManager.js index dd9d8516f..2326b4cf7 100755 --- a/filemanager/static/filemanager/js/fileManager.js +++ b/filemanager/static/filemanager/js/fileManager.js @@ -61,12 +61,12 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, $('#uploadBox').modal('show'); }; - $scope.showHTMLEditorModal = function () { + $scope.showHTMLEditorModal = function (MainFM= 0) { $scope.htmlEditorLoading = false; $scope.errorMessageEditor = true; $('#showHTMLEditor').modal('show'); $scope.fileInEditor = allFilesAndFolders[0]; - $scope.getFileContents(); + $scope.getFileContents(MainFM); }; @@ -754,13 +754,16 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader, // html editor - $scope.getFileContents = function () { + $scope.getFileContents = function (MainFM = 0) { // console.log("selectedfile"+ allFilesAndFolders) // console.log("currentpath"+ $scope.currentRPath) - var completePathForFile = $scope.currentRPath + "/" + allFilesAndFolders[0]; - + if(MainFM === 1){ + var completePathForFile = $scope.currentPath + "/" + allFilesAndFolders[0]; + }else { + var completePathForFile = $scope.currentRPath + "/" + allFilesAndFolders[0]; + } var data = { fileName: completePathForFile, diff --git a/filemanager/templates/filemanager/index.html b/filemanager/templates/filemanager/index.html index 8fc1643a8..367db5bb9 100755 --- a/filemanager/templates/filemanager/index.html +++ b/filemanager/templates/filemanager/index.html @@ -73,7 +73,7 @@ {% trans "Rename" %}