Client, upload: fix passing of nginx_upload_path and ftp_upload_site …

client/galaxy/scripts/apps/analysis.js

@@ -28,14 +28,17 @@ window.app = function app( options, bootstrapped ){
     // .................................................... panels and page
     var config = options.config,
         toolPanel = new ToolPanel({
-            el              : '#left',
-            userIsAnonymous : Galaxy.user.isAnonymous(),
-            require_login   : config.require_login,
-            spinner_url     : config.spinner_url,
-            search_url      : config.search_url,
-            toolbox         : config.toolbox,
-            toolbox_in_panel: config.toolbox_in_panel,
+            el                  : '#left',
+            userIsAnonymous     : Galaxy.user.isAnonymous(),
+            spinner_url         : config.spinner_url,
+            search_url          : config.search_url,
+            toolbox             : config.toolbox,
+            toolbox_in_panel    : config.toolbox_in_panel,
             stored_workflow_menu_entries : config.stored_workflow_menu_entries,
+            nginx_upload_path   : config.nginx_upload_path,
+            ftp_upload_site     : config.ftp_upload_site,
+            default_genome      : config.default_genome,
+            default_extension   : config.default_extension,
         }),
         centerPanel = new PANEL.CenterPanel({
             el              : '#center'

client/galaxy/scripts/apps/tool-panel.js

@@ -30,7 +30,12 @@ var ToolPanel = LeftPanel.extend({
         this.tool_panel_view = new Tools.ToolPanelView({ model: this.tool_panel });
 
         // add upload modal
-        this.uploadButton = new Upload( options );
+        this.uploadButton = new Upload({
+            nginx_upload_path   : options.nginx_upload_path,
+            ftp_upload_site     : options.ftp_upload_site,
+            default_genome      : options.default_genome,
+            default_extension   : options.default_extension,
+        });
     },
 
     render : function(){

lib/galaxy/managers/configuration.py

@@ -51,15 +51,18 @@ def _defaults_to( default ):
             'biostar_url_redirect'      : lambda *a, **c: self.url_for( controller='biostar', action='biostar_redirect',
                                                                         qualified=True ),
 
-            'allow_user_creation'       : lambda i, k, **c: i.allow_user_creation,
+            'allow_user_creation'       : _defaults_to( False ),
             'use_remote_user'           : _defaults_to( None ),
             'remote_user_logout_href'   : _defaults_to( '' ),
             'datatypes_disable_auto'    : _defaults_to( False ),
             'allow_user_dataset_purge'  : _defaults_to( False ),
             'ga_code'                   : _defaults_to( None ),
             'enable_unique_workflow_defaults' : _defaults_to( False ),
 
-            'nginx_upload_path'         : _defaults_to( False ),
+            # TODO: is there no 'correct' way to get an api url? controller='api', action='tools' is a hack
+            # at any rate: the following works with path_prefix but is still brittle
+            # TODO: change this to (more generic) upload_path and incorporate config.nginx_upload_path into building it
+            'nginx_upload_path'         : lambda i, k, **c: getattr( i, k, False ) or self.url_for( '/api/tools' ),
             'ftp_upload_dir'            : _defaults_to( None ),
             'ftp_upload_site'           : _defaults_to( None ),
             'version_major'             : _defaults_to( None ),
@@ -81,12 +84,11 @@ def _defaults_to( default ):
             return lambda i, k, **c: getattr( i, k, default )
 
         self.serializers.update({
-            # TODO: this is available from user data, remove
+            # TODO: this is available from user serialization: remove
             'is_admin_user'             : lambda *a: True,
 
             'library_import_dir'        : _defaults_to( None ),
             'user_library_import_dir'   : _defaults_to( None ),
             'allow_library_path_paste'  : _defaults_to( False ),
-            'allow_user_creation'       : _defaults_to( False ),
             'allow_user_deletion'       : _defaults_to( False ),
         })