From e7c1cade297055af1285c1c575a7570166c1c5ec Mon Sep 17 00:00:00 2001 From: John Chilton Date: Wed, 18 Dec 2013 14:59:11 -0600 Subject: [PATCH] Use get_history() in tools API controller. --- lib/galaxy/webapps/galaxy/api/tools.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/api/tools.py b/lib/galaxy/webapps/galaxy/api/tools.py index e90e8cc493a..c75f8efd6a0 100644 --- a/lib/galaxy/webapps/galaxy/api/tools.py +++ b/lib/galaxy/webapps/galaxy/api/tools.py @@ -1,7 +1,7 @@ import urllib from galaxy import web, util -from galaxy.web.base.controller import BaseAPIController, UsesHistoryDatasetAssociationMixin, UsesVisualizationMixin +from galaxy.web.base.controller import BaseAPIController, UsesHistoryDatasetAssociationMixin, UsesVisualizationMixin, UsesHistoryMixin from galaxy.visualization.genomes import GenomeRegion from galaxy.util.json import to_json_string, from_json_string from galaxy.visualization.data_providers.genome import * @@ -9,7 +9,7 @@ from galaxy.visualization.data_providers.genome import * import logging log = logging.getLogger( __name__ ) -class ToolsController( BaseAPIController, UsesVisualizationMixin ): +class ToolsController( BaseAPIController, UsesVisualizationMixin, UsesHistoryMixin ): """ RESTful controller for interactions with tools. """ @@ -85,8 +85,7 @@ class ToolsController( BaseAPIController, UsesVisualizationMixin ): # dataset upload. history_id = payload.get("history_id", None) if history_id: - target_history = trans.sa_session.query(trans.app.model.History).get( - trans.security.decode_id(history_id)) + target_history = self.get_history( trans, history_id ) else: target_history = None