1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b79236271786/ changeset: b79236271786 user: jgoecks date: 2013-01-10 21:18:34 summary: Visualization framework clean up: (a) remove 'circster' visualization type; and (b) add link to view trackster visualizations in Circster. affected #: 3 files diff -r 77832c6e2c342dbedfe7d8fc2f2c28772b956b87 -r b79236271786713189eae418da5626c159c4f119 lib/galaxy/web/base/controller.py --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -315,7 +315,7 @@ UsesLibraryMixinItems ): """ Mixin for controllers that use Visualization objects. """ - viz_types = [ "trackster", "circster" ] + viz_types = [ "trackster" ] def create_visualization( self, trans, type, title="Untitled Genome Vis", slug=None, dbkey=None, annotation=None, config={}, save=True ): """ Create visualiation and first revision. """ diff -r 77832c6e2c342dbedfe7d8fc2f2c28772b956b87 -r b79236271786713189eae418da5626c159c4f119 lib/galaxy/webapps/galaxy/controllers/visualization.py --- a/lib/galaxy/webapps/galaxy/controllers/visualization.py +++ b/lib/galaxy/webapps/galaxy/controllers/visualization.py @@ -187,7 +187,8 @@ grids.GridAction( "Create new visualization", dict( action='create' ) ) ] operations = [ - grids.GridOperation( "View/Edit", allow_multiple=False, url_args=get_url_args ), + grids.GridOperation( "Open", allow_multiple=False, url_args=get_url_args ), + grids.GridOperation( "Open in Circster", allow_multiple=False, condition=( lambda item: item.type == 'trackster' ), url_args=dict( action='circster' ) ), grids.GridOperation( "Edit Attributes", allow_multiple=False, url_args=dict( action='edit') ), grids.GridOperation( "Copy", allow_multiple=False, condition=( lambda item: not item.deleted ), async_compatible=False, url_args=dict( action='clone') ), grids.GridOperation( "Share or Publish", allow_multiple=False, condition=( lambda item: not item.deleted ), async_compatible=False ), @@ -727,6 +728,7 @@ """ # Get dataset to add. + dataset = None if dataset_id: dataset = self.get_hda_or_ldda( trans, hda_ldda, dataset_id ) @@ -734,6 +736,7 @@ if id: # Display existing viz. vis = self.get_visualization( trans, id, check_ownership=False, check_accessible=True ) + dbkey = vis.dbkey else: # Create new viz. if not dbkey: diff -r 77832c6e2c342dbedfe7d8fc2f2c28772b956b87 -r b79236271786713189eae418da5626c159c4f119 templates/webapps/galaxy/base_panels.mako --- a/templates/webapps/galaxy/base_panels.mako +++ b/templates/webapps/galaxy/base_panels.mako @@ -98,7 +98,7 @@ ## Visualization menu. <% menu_options = [ - [_('New Visualization'), h.url_for( controller='/visualization', action='trackster' ) ], + [_('New Track Browser'), h.url_for( controller='/visualization', action='trackster' ) ], [_('Saved Visualizations'), h.url_for( controller='/visualization', action='list' ) ] ] tab( "visualization", _("Visualization"), h.url_for( controller='/visualization', action='list'), menu_options=menu_options ) 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.