Merge branch 'remove_formbuilder' of https://github.com/guerler/galaxy into remove_formbuilder

client/galaxy/scripts/mvc/toolshed/repository-view.js

@@ -40,8 +40,9 @@ var ToolShedRepositoryView = Backbone.View.extend({
         this.options.tps_select_options = this.templatePanelSelectOptions;
         this.options.tool_dependencies = models.get("tool_dependencies");
         this.options.shed_tool_conf = this.templateShedToolConf({
-            stc_html: models.get("shed_conf")
+            shed_tool_confs: models.get("shed_conf")
         });
+        console.log(models.get("shed_conf"));
         this.options.panel_section_dict = models.get("panel_section_dict");
         this.options.api_url = `${Galaxy.root}api/tool_shed_repositories/install?async=True`;
         this.options = _.extend(this.options, options);
@@ -467,7 +468,11 @@ var ToolShedRepositoryView = Backbone.View.extend({
             '<div class="toolFormTitle">Shed tool configuration file:</div>',
             '<div class="toolFormBody">',
             '<div class="form-row">',
-            "<%= stc_html %>",
+            '<select name="shed_tool_conf">',
+            "<% _.each(shed_tool_confs.options, function(conf) { %>",
+            '<option value="<%= conf.value %>"><%= conf.label %></option>',
+            "<% }); %>",
+            '</select>',
             '<div class="toolParamHelp" style="clear: both;">Select the file whose <b>tool_path</b> setting you want used for installing repositories.</div>',
             "</div>",
             "</div>"

lib/tool_shed/util/form_util.py

@@ -288,9 +288,8 @@ class SelectField(BaseField):
         d['type'] = 'select'
         d['display'] = self.display
         d['multiple'] = self.multiple
-        d['data'] = []
-        for value in self.selectlist:
-            d['data'].append({'label': value, 'value': value})
+        d['data'] = [{'label': value, 'value': value} for value in self.selectlist]
+        d['options'] = [{'label': option[0], 'value': option[1], 'selected': option[2]} for option in self.options]
         return d