opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add changeset_revision to tool attributes, avoid self.tool_shed_repository

Browse Source
This commit is contained in:
Marius van den Beek
2016-02-25 20:09:44 +01:00
parent b14e35f48b
commit 990c0fe535
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/__init__.py
+6 -5
View File
@@ -952,6 +952,7 @@ class Tool( object, Dictifiable ):
self.tool_shed = tool_shed_repository.tool_shed
self.repository_name = tool_shed_repository.name
self.repository_owner = tool_shed_repository.owner
self.changeset_revision = tool_shed_repository.changeset_revision
self.installed_changeset_revision = tool_shed_repository.installed_changeset_revision
@property
@@ -1645,12 +1646,12 @@ class Tool( object, Dictifiable ):
tool_dict = super( Tool, self ).to_dict()
# Fill in ToolShedRepository info
if isinstance(self.tool_shed_repository, self.app.install_model.ToolShedRepository):
if hasattr(self, 'tool_shed') and self.tool_shed:
tool_dict['tool_shed_repository'] = {
'name': self.tool_shed_repository.name,
'owner': self.tool_shed_repository.owner,
'changeset_revision': self.tool_shed_repository.changeset_revision,
'tool_shed': self.tool_shed_repository.tool_shed
'name': self.repository_name,
'owner': self.repository_owner,
'changeset_revision': self.changeset_revision,
'tool_shed': self.tool_shed
}
# If an admin user, expose the path to the actual tool config XML file.