From 2b95d6911d577e931f88dd0f646e23109c558045 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Wed, 17 Apr 2019 17:11:18 +0200 Subject: [PATCH] Need to use unique function name --- lib/galaxy/managers/taggable.py | 4 ++-- lib/galaxy/managers/tools.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/managers/taggable.py b/lib/galaxy/managers/taggable.py index 165ab46c519..3e3c598f78c 100644 --- a/lib/galaxy/managers/taggable.py +++ b/lib/galaxy/managers/taggable.py @@ -96,7 +96,7 @@ class TaggableDeserializerMixin(object): class TaggableFilterMixin(object): - def create_expression(self, attr, op, val): + def create_tag_filter(self, attr, op, val): target_model = getattr(model, "%sTagAssociation" % self.model_class.__name__) id_column = "%s_id" % target_model.table.name.rsplit('_tag_association')[0] if ':' not in val and op == 'eq': @@ -119,5 +119,5 @@ class TaggableFilterMixin(object): def _add_parsers(self): self.orm_filter_parsers.update({ - 'tag': self.create_expression + 'tag': self.create_tag_filter }) diff --git a/lib/galaxy/managers/tools.py b/lib/galaxy/managers/tools.py index 7c1605ac64b..a324c136017 100644 --- a/lib/galaxy/managers/tools.py +++ b/lib/galaxy/managers/tools.py @@ -95,7 +95,7 @@ class DynamicToolManager(ModelManager): class ToolFilterMixin(object): - def create_expression(self, attr, op, val): + def create_tool_filter(self, attr, op, val): if op == 'eq': cond = model.Job.table.c.tool_id == val elif op == 'contains': @@ -110,5 +110,5 @@ class ToolFilterMixin(object): def _add_parsers(self): self.orm_filter_parsers.update({ - 'tool_id': self.create_expression, + 'tool_id': self.create_tool_filter, })