2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/f1cb7f07af2c/ Changeset: f1cb7f07af2c User: jmchilton Date: 2013-12-18 21:59:11 Summary: Use get_history() in tools API controller. Affected #: 1 file diff -r 0b2676366a82d61b5e46f4cae6a235e643548f78 -r f1cb7f07af2c923d3f3be77a0ae0ccb25c6453a7 lib/galaxy/webapps/galaxy/api/tools.py --- 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 * @@ -10,7 +10,7 @@ log = logging.getLogger( __name__ ) -class ToolsController( BaseAPIController, UsesVisualizationMixin ): +class ToolsController( BaseAPIController, UsesVisualizationMixin, UsesHistoryMixin ): """ RESTful controller for interactions with tools. """ @@ -86,8 +86,7 @@ # 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 https://bitbucket.org/galaxy/galaxy-central/commits/26da838b778c/ Changeset: 26da838b778c Branch: stable User: jmchilton Date: 2013-12-18 21:59:11 Summary: Use get_history() in tools API controller. Affected #: 1 file diff -r e059c6607f34b603e92e85cf0113b7b9b9635571 -r 26da838b778c68a5577d4cca9836f6ef70b8ed1b lib/galaxy/webapps/galaxy/api/tools.py --- 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 @@ 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 @@ # 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 Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.