1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/eb071eaf6338/ Changeset: eb071eaf6338 User: guerler Date: 2013-11-19 21:45:49 Summary: Upload: Do not use root when nginx_upload_path is defined Affected #: 2 files diff -r c3f3523b6580c23feab1ca90d1333ca05dc3abaa -r eb071eaf633899f235babae41240975ab98551a1 static/scripts/galaxy.upload.js --- a/static/scripts/galaxy.upload.js +++ b/static/scripts/galaxy.upload.js @@ -216,7 +216,7 @@ return null; // configure uploadbox - this.uploadbox.configure({url : galaxy_config.root + this.options.nginx_upload_path, paramname : "files_0|file_data"}); + this.uploadbox.configure({url : this.options.nginx_upload_path, paramname : "files_0|file_data"}); // configure tool tool_input = {}; diff -r c3f3523b6580c23feab1ca90d1333ca05dc3abaa -r eb071eaf633899f235babae41240975ab98551a1 templates/webapps/galaxy/galaxy.masthead.mako --- a/templates/webapps/galaxy/galaxy.masthead.mako +++ b/templates/webapps/galaxy/galaxy.masthead.mako @@ -34,7 +34,7 @@ masthead_config = { ## inject configuration 'brand' : app.config.get("brand", ""), - 'nginx_upload_path' : app.config.get("nginx_upload_path", "api/tools"), + 'nginx_upload_path' : app.config.get("nginx_upload_path", h.url_for(controller='api', action='tools')), 'use_remote_user' : app.config.use_remote_user, 'remote_user_logout_href' : app.config.remote_user_logout_href, 'enable_cloud_launch' : app.config.get_bool('enable_cloud_launch', False), Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.