Fix visualization controller to use security.decode_id in grids

This commit is contained in:
Carl Eberhard
2015-02-26 14:15:47 -05:00
parent 057a9c9f16
commit a34695d07c
@@ -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 ):