1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c3f3523b6580/ Changeset: c3f3523b6580 User: guerler Date: 2013-11-19 20:56:07 Summary: Upload: Use nginx_upload_path setting Affected #: 2 files diff -r 95a7a6be8791721f97f33f56e4c5bb56787ec181 -r c3f3523b6580c23feab1ca90d1333ca05dc3abaa static/scripts/galaxy.upload.js --- a/static/scripts/galaxy.upload.js +++ b/static/scripts/galaxy.upload.js @@ -47,8 +47,13 @@ } }, + // options + options : { + nginx_upload_path : '' + }, + // initialize - initialize : function() + initialize : function(options) { // wait for galaxy history panel (workaround due to the use of iframes) if (!Galaxy.currHistoryPanel) @@ -108,6 +113,11 @@ // insert default back to array self.select_genome.unshift(def); }); + + // read in options + if (options) { + this.options = _.defaults(options, this.options); + } }, // mouse over @@ -206,7 +216,7 @@ return null; // configure uploadbox - this.uploadbox.configure({url : galaxy_config.root + "api/tools", paramname : "files_0|file_data"}); + this.uploadbox.configure({url : galaxy_config.root + this.options.nginx_upload_path, paramname : "files_0|file_data"}); // configure tool tool_input = {}; diff -r 95a7a6be8791721f97f33f56e4c5bb56787ec181 -r c3f3523b6580c23feab1ca90d1333ca05dc3abaa templates/webapps/galaxy/galaxy.masthead.mako --- a/templates/webapps/galaxy/galaxy.masthead.mako +++ b/templates/webapps/galaxy/galaxy.masthead.mako @@ -34,6 +34,7 @@ masthead_config = { ## inject configuration 'brand' : app.config.get("brand", ""), + 'nginx_upload_path' : app.config.get("nginx_upload_path", "api/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), @@ -98,7 +99,7 @@ }); ## add upload plugin - ##Galaxy.upload = new mod_upload.GalaxyUpload(); + ##Galaxy.upload = new mod_upload.GalaxyUpload(masthead_config); ## add quota meter to masthead Galaxy.quotaMeter = new UserQuotaMeter({ 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.