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 #4836 from guerler/filter_visualization_grid

Browse Source 
[17.09] Add filter to visualization dataset queries
This commit is contained in:
Nate Coraor
2017-10-20 14:39:25 -04:00
committed by GitHub
parent 30b9e5e4af 799fda61db
commit 5016a2d525
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/visualization.py
+4 -2
View File
@@ -72,7 +72,8 @@ class HistoryDatasetsSelectionGrid(grids.Grid):
def apply_query_filter(self, trans, query, **kwargs):
if self.available_tracks is None:
self.available_tracks = trans.app.datatypes_registry.get_available_tracks()
return query.filter(model.HistoryDatasetAssociation.extension.in_(self.available_tracks)) \
return query.filter(model.History.user == trans.user) \
.filter(model.HistoryDatasetAssociation.extension.in_(self.available_tracks)) \
.filter(model.Dataset.state == model.Dataset.states.OK) \
.filter(model.HistoryDatasetAssociation.deleted == false()) \
.filter(model.HistoryDatasetAssociation.visible == true())
@@ -100,7 +101,8 @@ class LibraryDatasetsSelectionGrid(grids.Grid):
def apply_query_filter(self, trans, query, **kwargs):
if self.available_tracks is None:
self.available_tracks = trans.app.datatypes_registry.get_available_tracks()
return query.filter(model.LibraryDatasetDatasetAssociation.extension.in_(self.available_tracks)) \
return query.filter(model.LibraryDatasetDatasetAssociation.user == trans.user) \
.filter(model.LibraryDatasetDatasetAssociation.extension.in_(self.available_tracks)) \
.filter(model.Dataset.state == model.Dataset.states.OK) \
.filter(model.LibraryDatasetDatasetAssociation.deleted == false()) \
.filter(model.LibraryDatasetDatasetAssociation.visible == true())