From a34695d07cec8b7ff992fa867fe4a8b47af0c80c Mon Sep 17 00:00:00 2001 From: Carl Eberhard Date: Thu, 26 Feb 2015 14:15:47 -0500 Subject: [PATCH] Fix visualization controller to use security.decode_id in grids --- lib/galaxy/webapps/galaxy/controllers/visualization.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/visualization.py b/lib/galaxy/webapps/galaxy/controllers/visualization.py index f0b6ab29013..990fb5882d3 100644 --- a/lib/galaxy/webapps/galaxy/controllers/visualization.py +++ b/lib/galaxy/webapps/galaxy/controllers/visualization.py @@ -128,7 +128,7 @@ class DbKeyColumn( grids.GridColumn ): class HistoryColumn( grids.GridColumn ): """ Column for filtering by history id. """ def filter( self, trans, user, query, history_id ): - return query.filter( model.History.id==self.decode_id(history_id) ) + return query.filter( model.History.id==trans.security.decode_id(history_id) ) class HistoryDatasetsSelectionGrid( grids.Grid ): # Grid definition. @@ -157,7 +157,7 @@ class HistoryDatasetsSelectionGrid( grids.Grid ): Current item for grid is the history being queried. This is a bit of hack since current_item typically means the current item in the grid. """ - return trans.sa_session.query( model.History ).get( self.decode_id( kwargs[ 'f-history' ] ) ) + return trans.sa_session.query( model.History ).get( trans.security.decode_id( kwargs[ 'f-history' ] ) ) def build_initial_query( self, trans, **kwargs ): return trans.sa_session.query( self.model_class ).join( model.History.table ).join( model.Dataset.table ) def apply_query_filter( self, trans, query, **kwargs ):