From 42dc7b361756b096f9d3b17c06e2db1a5cefbe61 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 20 Oct 2017 11:30:45 -0400 Subject: [PATCH 1/2] Filter histories for visualization grids by user --- lib/galaxy/webapps/galaxy/controllers/visualization.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/visualization.py b/lib/galaxy/webapps/galaxy/controllers/visualization.py index 9c7c1e5424e5..bde7ad5870a9 100644 --- a/lib/galaxy/webapps/galaxy/controllers/visualization.py +++ b/lib/galaxy/webapps/galaxy/controllers/visualization.py @@ -72,7 +72,8 @@ def build_initial_query(self, trans, **kwargs): 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()) From 799fda61dbf3ddaad1b386d9d32602ef2b1c8a83 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 20 Oct 2017 11:57:37 -0400 Subject: [PATCH 2/2] Filter library dataset by user --- lib/galaxy/webapps/galaxy/controllers/visualization.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/visualization.py b/lib/galaxy/webapps/galaxy/controllers/visualization.py index bde7ad5870a9..e9cfe968fa66 100644 --- a/lib/galaxy/webapps/galaxy/controllers/visualization.py +++ b/lib/galaxy/webapps/galaxy/controllers/visualization.py @@ -101,7 +101,8 @@ def build_initial_query(self, trans, **kwargs): 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())