From 54173807e56e8ae4bef4cc0511249d6b87380de2 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 14 Apr 2016 10:32:04 -0400 Subject: [PATCH] Re-use ``trans`` logic for calculating user_ftp_dir. --- lib/galaxy/webapps/galaxy/api/remote_files.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/api/remote_files.py b/lib/galaxy/webapps/galaxy/api/remote_files.py index 12118d3d0fa..c0c6be8d78d 100644 --- a/lib/galaxy/webapps/galaxy/api/remote_files.py +++ b/lib/galaxy/webapps/galaxy/api/remote_files.py @@ -90,9 +90,7 @@ class RemoteFilesAPIController( BaseAPIController ): if user_ftp_base_dir is None: raise exceptions.ConfigDoesNotAllowException( 'The configuration of this Galaxy instance does not allow upload from FTP directories.' ) try: - user_ftp_dir = None - identifier = trans.app.config.ftp_upload_dir_identifier - user_ftp_dir = os.path.join( user_ftp_base_dir, getattr(trans.user, identifier) ) + user_ftp_dir = trans.user_ftp_dir if user_ftp_dir is not None: response = self.__load_all_filenames( user_ftp_dir ) else: