Skip to content

Commit

Permalink
Merge pull request #2 from dannon/history-grid-state-optimization
Browse files Browse the repository at this point in the history
Minor style tweaks to pass flake8
  • Loading branch information
jgoecks committed Mar 17, 2016
2 parents 6a123b1 + 4520a61 commit 8c1defe
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions lib/galaxy/webapps/galaxy/controllers/history.py
Expand Up @@ -43,14 +43,14 @@ def get_value( self, trans, grid, history ):

# Get dataset counts for each state in a state-count dictionary.
state_counts = dict( ( state, count ) for state, count in
trans.sa_session.query( model.Dataset.state, func.count(model.Dataset.state) )
.join( model.HistoryDatasetAssociation )
.group_by( model.Dataset.state )
.filter( model.HistoryDatasetAssociation.history_id == history.id,
model.HistoryDatasetAssociation.visible == True,
model.HistoryDatasetAssociation.deleted == False,
model.Dataset.state.in_(states_to_show) )
)
trans.sa_session.query( model.Dataset.state, func.count(model.Dataset.state) )
.join( model.HistoryDatasetAssociation )
.group_by( model.Dataset.state )
.filter( model.HistoryDatasetAssociation.history_id == history.id,
model.HistoryDatasetAssociation.visible == true,
model.HistoryDatasetAssociation.deleted == false,
model.Dataset.state.in_(states_to_show) )
)

# Create HTML.
rval = ''
Expand Down

0 comments on commit 8c1defe

Please sign in to comment.