diff --git a/client/galaxy/scripts/mvc/upload/upload-row.js b/client/galaxy/scripts/mvc/upload/upload-row.js index bb8e09c6b64..fde0545dd0f 100644 --- a/client/galaxy/scripts/mvc/upload/upload-row.js +++ b/client/galaxy/scripts/mvc/upload/upload-row.js @@ -69,7 +69,7 @@ return Backbone.View.extend({ css: 'genome', onchange : function(genome) { self.model.set('genome', genome); - self.app.updateGenome(genome); + self.app.updateGenome(genome, true); }, data: self.app.list_genomes, container: it.find('#genome'), @@ -87,7 +87,7 @@ return Backbone.View.extend({ css: 'extension', onchange : function(extension) { self.model.set('extension', extension); - self.app.updateExtension(extension); + self.app.updateExtension(extension, true); }, data: self.app.list_extensions, container: it.find('#extension'), diff --git a/client/galaxy/scripts/mvc/upload/upload-view.js b/client/galaxy/scripts/mvc/upload/upload-view.js index 0bbed8d4750..c90639df250 100644 --- a/client/galaxy/scripts/mvc/upload/upload-view.js +++ b/client/galaxy/scripts/mvc/upload/upload-view.js @@ -585,20 +585,20 @@ return Backbone.View.extend({ }, // update extension for all models - updateExtension: function(extension) { + updateExtension: function(extension, defaults_only) { var self = this; this.collection.each(function(item) { - if (item.get('status') == 'init' && item.get('extension') == self.default_extension) { + if (item.get('status') == 'init' && (item.get('extension') == self.default_extension || !defaults_only)) { item.set('extension', extension); } }); }, // update genome for all models - updateGenome: function(genome) { + updateGenome: function(genome, defaults_only) { var self = this; this.collection.each(function(item) { - if (item.get('status') == 'init' && item.get('genome') == self.default_genome) { + if (item.get('status') == 'init' && (item.get('genome') == self.default_genome || !defaults_only)) { item.set('genome', genome); } }); @@ -724,10 +724,10 @@ return Backbone.View.extend({ '' + '' + '