1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/e35c7bb3f7ed/ changeset: e35c7bb3f7ed user: jgoecks date: 2011-07-22 16:03:41 summary: Trackster: enable datasets without a set dbkey to be added to a visualization. affected #: 3 files (275 bytes)
--- a/lib/galaxy/web/controllers/tracks.py Thu Jul 21 16:19:52 2011 -0400 +++ b/lib/galaxy/web/controllers/tracks.py Fri Jul 22 10:03:41 2011 -0400 @@ -93,7 +93,11 @@ """ Filter by dbkey. """ # use raw SQL b/c metadata is a BLOB dbkey = dbkey.replace("'", "\'") - return query.filter( or_( "metadata like '%%"dbkey": ["%s"]%%'" % dbkey, "metadata like '%%"dbkey": "%s"%%'" % dbkey ) ) + return query.filter( or_( \ + or_( "metadata like '%%"dbkey": ["%s"]%%'" % dbkey, "metadata like '%%"dbkey": "%s"%%'" % dbkey ), \ + or_( "metadata like '%%"dbkey": ["?"]%%'", "metadata like '%%"dbkey": "?"%%'" ) \ + ) + )
class HistoryColumn( grids.GridColumn ): """ Column for filtering by history id. """
--- a/static/scripts/trackster.js Thu Jul 21 16:19:52 2011 -0400 +++ b/static/scripts/trackster.js Fri Jul 22 10:03:41 2011 -0400 @@ -807,6 +807,9 @@ } view.redraw(); }, + /** + * Add a track to the view. + */ add_track: function(track) { track.view = this; track.track_id = this.track_id_counter;
--- a/templates/tracks/browser.mako Thu Jul 21 16:19:52 2011 -0400 +++ b/templates/tracks/browser.mako Fri Jul 22 10:03:41 2011 -0400 @@ -273,7 +273,7 @@ }
// Add track. - tracks.push( { + tracks.push({ "track_type": track.get_type(), "name": track.name, "hda_ldda": track.hda_ldda,
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.