1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ffe1fed76848/ Changeset: ffe1fed76848 User: dan Date: 2014-05-21 20:24:51 Summary: merge next-stable Affected #: 1 file diff -r 6f2455ab4acbce667ff5155fd85fef4d3dacc9cc -r ffe1fed76848569754c81c59fdba999d488782c9 lib/galaxy/util/dbkeys.py --- a/lib/galaxy/util/dbkeys.py +++ b/lib/galaxy/util/dbkeys.py @@ -16,9 +16,10 @@ self._data_table_name = data_table_name self._static_chrom_info_path = app.config.len_file_path # A dbkey can be listed multiple times, but with different names, so we can't use dictionaries for lookups - self._static_dbkeys = [] if load_old_style: self._static_dbkeys = list( dbnames ) + else: + self._static_dbkeys = [] def get_genome_build_names( self, trans=None ): # FIXME: how to deal with key duplicates? @@ -34,7 +35,7 @@ datasets = trans.sa_session.query( self._app.model.HistoryDatasetAssociation ) \ .filter_by( deleted=False, history_id=trans.history.id, extension="len" ) for dataset in datasets: - rval.append( (dataset.dbkey, dataset.name) ) + rval.append( ( dataset.dbkey, "%s (%s) [History]" % ( dataset.name, dataset.dbkey ) ) ) user = trans.get_user() if user and 'dbkeys' in user.preferences: user_keys = from_json_string( user.preferences['dbkeys'] ) 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.