From 3b4e7fb5ee367e4b38a0f47e5ffaaccfbcfee031 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Mon, 31 Jul 2023 15:48:46 +0200 Subject: [PATCH] Drop final use of hda_manager.tag_handler --- .../galaxy/services/history_contents.py | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/services/history_contents.py b/lib/galaxy/webapps/galaxy/services/history_contents.py index 0232c7ff555..0254f92001f 100644 --- a/lib/galaxy/webapps/galaxy/services/history_contents.py +++ b/lib/galaxy/webapps/galaxy/services/history_contents.py @@ -43,7 +43,10 @@ from galaxy.managers.collections_util import ( api_payload_to_create_params, dictify_dataset_collection_instance, ) -from galaxy.managers.context import ProvidesHistoryContext +from galaxy.managers.context import ( + ProvidesHistoryContext, + ProvidesUserContext, +) from galaxy.managers.genomes import GenomesManager from galaxy.managers.history_contents import ( HistoryContentsFilters, @@ -1389,10 +1392,8 @@ class HistoryItemOperator: item, params, trans ), HistoryContentItemOperation.change_dbkey: lambda item, params, trans: self._change_dbkey(item, params), - HistoryContentItemOperation.add_tags: lambda item, params, trans: self._add_tags(item, trans.user, params), - HistoryContentItemOperation.remove_tags: lambda item, params, trans: self._remove_tags( - item, trans.user, params - ), + HistoryContentItemOperation.add_tags: lambda item, params, trans: self._add_tags(trans, item, params), + HistoryContentItemOperation.remove_tags: lambda item, params, trans: self._remove_tags(trans, item, params), } def apply( @@ -1478,10 +1479,8 @@ class HistoryItemOperator: for dataset_instance in item.dataset_instances: dataset_instance.set_dbkey(params.dbkey) - def _add_tags(self, item: HistoryItemModel, user: User, params: TagOperationParams): - manager = self._get_item_manager(item) - manager.tag_handler.add_tags_from_list(user, item, params.tags, flush=self.flush) + def _add_tags(self, trans: ProvidesUserContext, item: HistoryItemModel, params: TagOperationParams): + trans.tag_handler.add_tags_from_list(trans.user, item, params.tags, flush=self.flush) - def _remove_tags(self, item: HistoryItemModel, user: User, params: TagOperationParams): - manager = self._get_item_manager(item) - manager.tag_handler.remove_tags_from_list(user, item, params.tags, flush=self.flush) + def _remove_tags(self, trans: ProvidesUserContext, item: HistoryItemModel, params: TagOperationParams): + trans.tag_handler.remove_tags_from_list(trans.user, item, params.tags, flush=self.flush)