diff --git a/web/pgadmin/misc/file_manager/__init__.py b/web/pgadmin/misc/file_manager/__init__.py index 96f61c8..7581583 100644 --- a/web/pgadmin/misc/file_manager/__init__.py +++ b/web/pgadmin/misc/file_manager/__init__.py @@ -245,7 +245,7 @@ class Filemanager(object): ) self.dir = get_storage_directory() - if isinstance(self.dir, list): + if self.dir is not None and isinstance(self.dir, list): self.dir = "" @staticmethod @@ -507,6 +507,8 @@ class Filemanager(object): """ path = unquote(path) + if self.dir is None: + self.dir = "" orig_path = "{0}{1}".format(self.dir, path) user_dir = path thefile = { diff --git a/web/pgadmin/misc/file_manager/templates/file_manager/js/file_manager.js b/web/pgadmin/misc/file_manager/templates/file_manager/js/file_manager.js index 55c2fa1..aa23b56 100644 --- a/web/pgadmin/misc/file_manager/templates/file_manager/js/file_manager.js +++ b/web/pgadmin/misc/file_manager/templates/file_manager/js/file_manager.js @@ -138,7 +138,9 @@ define([ sel_file = $('.fileinfo tbody tr.selected td p span').attr('title'); } var newFile = $('.currentpath').val() + sel_file; - newFile = newFile.substr(1); + if (newFile.indexOf('/') == 0) { + newFile = newFile.substr(1); + } pgAdmin.Browser.Events.trigger('pgadmin-storage:finish_btn:storage_dialog', newFile); } removeTransId(trans_id); @@ -249,7 +251,9 @@ define([ sel_file = $('.fileinfo tbody tr.selected td p span').attr('title'); } var newFile = $('.currentpath').val() + sel_file; - newFile = newFile.substr(1); + if (newFile.indexOf('/') == 0) { + newFile = newFile.substr(1); + } pgAdmin.Browser.Events.trigger('pgadmin-storage:finish_btn:select_file', newFile); } removeTransId(trans_id); @@ -360,7 +364,9 @@ define([ sel_file = $('.fileinfo tbody tr.selected td p span').attr('title'); } var newFile = $('.currentpath').val() + sel_file; - newFile = newFile.substr(1); + if (newFile.indexOf('/') == 0) { + newFile = newFile.substr(1); + } pgAdmin.Browser.Events.trigger('pgadmin-storage:finish_btn:select_folder', newFile); } removeTransId(trans_id); @@ -468,8 +474,10 @@ define([ $('.replace_file .btn_yes').click(function(self) { $('.replace_file, .fm_dimmer').hide(); var selected_item = $('.allowed_file_types .create_input input[type="text"]').val(), - sel_item = $('.currentpath').val() + selected_item, - newFile = sel_item.substr(1); + newFile = $('.currentpath').val() + selected_item; + if (newFile.indexOf('/') == 0) { + newFile = newFile.substr(1); + } pgAdmin.Browser.Events.trigger('pgadmin-storage:finish_btn:create_file', newFile); $('.file_manager_create_cancel').trigger('click'); }); @@ -509,7 +517,9 @@ define([ if (closeEvent.button.text == "{{ _('Create') }}") { var selected_item = $('.allowed_file_types .create_input input[type="text"]').val(); var newFile = $('.currentpath').val() + selected_item; - newFile = newFile.substr(1); + if (newFile.indexOf('/') == 0) { + newFile = newFile.substr(1); + } if(!_.isUndefined(selected_item) && selected_item !== '' && this.is_file_exist()) { this.replace_file(); closeEvent.cancel = true; diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py index 74c37a4..094cc6d 100644 --- a/web/pgadmin/tools/sqleditor/__init__.py +++ b/web/pgadmin/tools/sqleditor/__init__.py @@ -1117,7 +1117,8 @@ def load_file(): # retrieve storage directory path storage_manager_path = get_storage_directory() - + if storage_manager_path is None: + storage_manager_path = "" # generate full path of file file_path = os.path.join( storage_manager_path, diff --git a/web/pgadmin/utils/paths.py b/web/pgadmin/utils/paths.py index 81b0f74..b6677ed 100644 --- a/web/pgadmin/utils/paths.py +++ b/web/pgadmin/utils/paths.py @@ -65,7 +65,7 @@ def init_app(app): ) os.makedirs(storage_dir, int('700', 8)) - if not os.access(storage_dir, os.W_OK | os.R_OK): + if storage_dir and not os.access(storage_dir, os.W_OK | os.R_OK): raise Exception( 'The user does not have permission to read, write on the specified storage directory!' )