Merge pull request #4836 from guerler/filter_visualization_grid

[17.09] Add filter to visualization dataset queries
galaxyproject · Oct 20, 2017 · 5016a2d · 5016a2d
2 parents 30b9e5e + 799fda6
commit 5016a2d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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())
@@ -100,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())