opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_15.03' of https://github.com/galaxyproject/galaxy into release_15.03

Browse Source
This commit is contained in:
guerler
2015-02-27 10:17:05 -05:00
parent 3c11c856a2 fe523237c6
commit 6080ff92e6
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/history.py
+5 -3
View File
@@ -543,8 +543,10 @@ class HistoryController( BaseUIController, SharableMixin, UsesAnnotations, UsesI
def structure( self, trans, id=None, **kwargs ):
"""
"""
id = self.decode_id( id ) if id else trans.history.id
history_to_view = self.history_manager.get_accessible( trans, id, trans.user )
unencoded_history_id = trans.history.id
if id:
unencoded_history_id = self.decode_id( id )
history_to_view = self.history_manager.get_accessible( trans, unencoded_history_id, trans.user )
history_data = self.history_manager._get_history_data( trans, history_to_view )
history_dictionary = history_data[ 'history' ]
@@ -552,7 +554,7 @@ class HistoryController( BaseUIController, SharableMixin, UsesAnnotations, UsesI
jobs = ( trans.sa_session.query( trans.app.model.Job )
.filter( trans.app.model.Job.user == trans.user )
.filter( trans.app.model.Job.history_id == self.decode_id( id ) ) ).all()
.filter( trans.app.model.Job.history_id == unencoded_history_id ) ).all()
jobs = map( lambda j: self.encode_all_ids( trans, j.to_dict( 'element' ), True ), jobs )
tools = {}
templates/webapps/galaxy/history/display_structured.mako
+3 -1
View File
@@ -128,13 +128,15 @@
## ----------------------------------------------------------------------------
<%def name="javascripts()">
<%
from galaxy.managers import hdas
hda_serializer = hdas.HDASerializer( trans.app )
self.js_app = 'display-structured'
controller = trans.webapp.controllers[ 'history' ]
hda_dicts = []
id_hda_dict_map = {}
for hda in history.active_datasets:
hda_dict = controller.get_hda_dict( trans, hda )
hda_dict = hda_serializer.serialize_to_view( trans, hda, 'detailed' )
id_hda_dict_map[ hda_dict[ 'id' ] ] = hda_dict
hda_dicts.append( hda_dict )
%>