1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/96d3d3a4fdde/ Changeset: 96d3d3a4fdde User: carlfeberhard Date: 2014-11-14 19:41:30+00:00 Summary: History contents API: allow detailed view of HDCA's in index Affected #: 2 files

diff -r 7fc0bcc3cdb1e17485035e420d1e0452173cab61 -r 96d3d3a4fddeda7bba13d8789f215b684f3a2b09 lib/galaxy/webapps/galaxy/api/history_contents.py --- a/lib/galaxy/webapps/galaxy/api/history_contents.py +++ b/lib/galaxy/webapps/galaxy/api/history_contents.py @@ -107,15 +107,21 @@ details = util.listify( details )

for content in history.contents_iter( **contents_kwds ): + encoded_content_id = trans.security.encode_id( content.id ) + detailed = details == 'all' or ( encoded_content_id in details ) + if isinstance( content, trans.app.model.HistoryDatasetAssociation ): - encoded_content_id = trans.security.encode_id( content.id ) - detailed = details == 'all' or ( encoded_content_id in details ) if detailed: rval.append( self._detailed_hda_dict( trans, content ) ) else: rval.append( self._summary_hda_dict( trans, history_id, content ) ) + elif isinstance( content, trans.app.model.HistoryDatasetCollectionAssociation ): - rval.append( self.__collection_dict( trans, content ) ) + if detailed: + rval.append( self.__collection_dict( trans, content, view="element" ) ) + else: + rval.append( self.__collection_dict( trans, content ) ) + return rval

#TODO: move to model or Mixin

diff -r 7fc0bcc3cdb1e17485035e420d1e0452173cab61 -r 96d3d3a4fddeda7bba13d8789f215b684f3a2b09 templates/webapps/galaxy/root/index.mako --- a/templates/webapps/galaxy/root/index.mako +++ b/templates/webapps/galaxy/root/index.mako @@ -147,8 +147,7 @@ linkTarget : 'galaxy_main', $scrollContainer: function(){ return this.$el.parent(); } }); - currPanel - .connectToQuotaMeter( Galaxy.quotaMeter ); + currPanel.connectToQuotaMeter( Galaxy.quotaMeter ); currPanel.loadCurrentHistory(); Galaxy.currHistoryPanel = currPanel; });

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.