1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/3c64bf81e1fc/ Changeset: 3c64bf81e1fc User: carlfeberhard Date: 2014-02-20 23:44:04 Summary: (Fix to 8e4196a) Histories embedded in pages: first pass at using panel Affected #: 2 files

diff -r ccbd6e8e64ee76bf64dca24368052fc6ff775623 -r 3c64bf81e1fcbcf0c89b316ee7b80548e10214a8 lib/galaxy/webapps/galaxy/controllers/history.py --- a/lib/galaxy/webapps/galaxy/controllers/history.py +++ b/lib/galaxy/webapps/galaxy/controllers/history.py @@ -753,7 +753,21 @@ history.annotation = self.get_item_annotation_str( trans.sa_session, history.user, history ) for dataset in datasets: dataset.annotation = self.get_item_annotation_str( trans.sa_session, history.user, dataset ) - return trans.stream_template_mako( "/history/item_content.mako", item = history, item_data = datasets ) + + user_is_owner = trans.user == history.user + history.annotation = self.get_item_annotation_str( trans.sa_session, history.user, history ) + + hda_dicts = [] + datasets = self.get_history_datasets( trans, history ) + for hda in datasets: + hda_dict = self.get_hda_dict( trans, hda ) + hda_dict[ 'annotation' ] = self.get_item_annotation_str( trans.sa_session, history.user, hda ) + hda_dicts.append( hda_dict ) + history_dict = self.get_history_dict( trans, history, hda_dictionaries=hda_dicts ) + history_dict[ 'annotation' ] = history.annotation + + return trans.fill_template( "history/item_content.mako", item=history, item_data=datasets, + user_is_owner=user_is_owner, history_dict=history_dict, hda_dicts=hda_dicts )

@web.expose def name_autocomplete_data( self, trans, q=None, limit=None, timestamp=None ):

diff -r ccbd6e8e64ee76bf64dca24368052fc6ff775623 -r 3c64bf81e1fcbcf0c89b316ee7b80548e10214a8 templates/display_base.mako --- a/templates/display_base.mako +++ b/templates/display_base.mako @@ -11,6 +11,7 @@ <%inherit file="${inherit( context )}"/><%namespace file="/tagging_common.mako" import="render_individual_tagging_element, render_community_tagging_element" /><%namespace file="/display_common.mako" import="*" /> +<%namespace file="webapps/galaxy/history/history_panel.mako" import="history_panel_javascripts" />

## ## Functions used by base.mako and base_panels.mako to display content. @@ -34,7 +35,7 @@ ${parent.javascripts()} ${h.js( "libs/jquery/jstorage", "libs/jquery/jquery.autocomplete", "libs/jquery/jquery.rating", "galaxy.autocom_tagging" )} - + ${history_panel_javascripts()} ${h.js( "galaxy.panels", "libs/jquery/jstorage", "libs/jquery/jquery.event.drag", "libs/jquery/jquery.event.hover","libs/jquery/jquery.mousewheel", "libs/jquery/jquery-ui", "libs/require", "libs/farbtastic" )}

<script type="text/javascript"> @@ -151,6 +152,18 @@ border-right-style: solid; border-right-color: #66AA66; } + + .embedded-item.history .item-content { + padding: 8px; + background-color: white; + border-radius: 0px 0px 4px 4px; + } + .embedded-item.history hr { + margin-bottom: 2px; + } + .embedded-item.history .history-panel { + padding: 2px 0px 8px 0px; + } </style></%def>

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.