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 pull request #11923 from cat-bro/fix_legacy_grids_state_column

Browse Source 
[21.01] update legacy_framework.grids.StateColumn (bug fix)
This commit is contained in:
Marius van den Beek
2021-05-04 15:42:53 +02:00
committed by GitHub
parent 8c029f5b04 4f8503be29
commit 40e73295a6
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/legacy_framework/grids.py
+4 -7
View File
@@ -390,9 +390,6 @@ class DeletedColumn(GridColumn):
class StateColumn(GridColumn):
"""
Column that tracks and filters for items with state attribute.
IMPORTANT NOTE: self.model_class must have a states Bunch or dict if
this column type is used in the grid.
"""
def get_value(self, trans, grid, item):
@@ -402,7 +399,7 @@ class StateColumn(GridColumn):
"""Modify query to filter self.model_class by state."""
if column_filter == "All":
pass
elif column_filter in [v for k, v in self.model_class.states.items()]:
elif column_filter in list(self.model_class.states):
query = query.filter(self.model_class.state == column_filter)
return query
@@ -410,9 +407,9 @@ class StateColumn(GridColumn):
"""Returns a list of accepted filters for this column."""
all = GridColumnFilter('all', {self.key: 'All'})
accepted_filters = [all]
for v in self.model_class.states.values():
args = {self.key: v}
accepted_filters.append(GridColumnFilter(v, args))
for state in self.model_class.states:
args = {self.key: state.value}
accepted_filters.append(GridColumnFilter(state.value, args))
return accepted_filters