1 new changeset in galaxy-central:

http://bitbucket.org/galaxy/galaxy-central/changeset/5b5f693ca5cb/ changeset: 5b5f693ca5cb user: afgane date: 2011-06-08 17:15:42 summary: Do not display non-functional buttons for editing tags/annotations on history Show Structure page affected #: 2 files (106 bytes)

--- a/templates/history/display_structured.mako Tue Jun 07 14:53:53 2011 -0400 +++ b/templates/history/display_structured.mako Wed Jun 08 11:15:42 2011 -0400 @@ -91,7 +91,7 @@ </%def><%def name="render_item_hda( hda, children )"> - ${render_dataset( hda, hda.hid )} + ${render_dataset( hda, hda.hid, display_structured=True )} </%def><%def name="render_item_job( job, children )">

--- a/templates/root/history_common.mako Tue Jun 07 14:53:53 2011 -0400 +++ b/templates/root/history_common.mako Wed Jun 08 11:15:42 2011 -0400 @@ -1,6 +1,6 @@ <% _=n_ %> ## Render the dataset `data` as history item, using `hid` as the displayed id -<%def name="render_dataset( data, hid, show_deleted_on_refresh = False, for_editing = True )"> +<%def name="render_dataset( data, hid, show_deleted_on_refresh = False, for_editing = True, display_structured = False )"><% dataset_id = trans.security.encode_id( data.id ) from galaxy.datatypes.metadata import FileParameter @@ -171,10 +171,12 @@ new-url="${h.url_for( controller='tracks', action='index', dataset_id=dataset_id, default_dbkey=data.dbkey)}" title="Visualize in Trackster"></a> %endif %if trans.user: - <div style="float: right"> - <a href="${h.url_for( controller='tag', action='retag', item_class=data.__class__.__name__, item_id=dataset_id )}" target="galaxy_main" title="Edit dataset tags" class="icon-button tags tooltip"></a> - <a href="${h.url_for( controller='dataset', action='annotate', id=dataset_id )}" target="galaxy_main" title="Edit dataset annotation" class="icon-button annotate tooltip"></a> - </div> + %if not display_structured: + <div style="float: right"> + <a href="${h.url_for( controller='tag', action='retag', item_class=data.__class__.__name__, item_id=dataset_id )}" target="galaxy_main" title="Edit dataset tags" class="icon-button tags tooltip"></a> + <a href="${h.url_for( controller='dataset', action='annotate', id=dataset_id )}" target="galaxy_main" title="Edit dataset annotation" class="icon-button annotate tooltip"></a> + </div> + %endif <div style="clear: both"></div><div class="tag-area" style="display: none"><strong>Tags:</strong>

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.