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

Fix links in the tool shed's Galaxy utilities grids.

Browse Source
This commit is contained in:
Greg Von Kuster
2013-03-04 14:29:23 -05:00
parent 1d0ab0969a
commit cc0c717cff
2 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/tool_shed/controllers/repository.py
+33 -5
View File
@@ -82,10 +82,17 @@ class RepositoryController( BaseUIController, common_util.ItemRatings ):
def browse_datatypes( self, trans, **kwd ):
if 'operation' in kwd:
operation = kwd[ 'operation' ].lower()
# The received id is a RepositoryMetadata id.
repository_metadata_id = kwd[ 'id' ]
repository_metadata = suc.get_repository_metadata_by_id( trans, repository_metadata_id )
repository_id = trans.security.encode_id( repository_metadata.repository_id )
changeset_revision = repository_metadata.changeset_revision
new_kwd = dict( id=repository_id,
changeset_revision=changeset_revision )
if operation == "view_or_manage_repository":
return trans.response.send_redirect( web.url_for( controller='repository',
action='view_or_manage_repository',
**kwd ) )
**new_kwd ) )
return self.datatypes_grid( trans, **kwd )
@web.expose
@@ -256,34 +263,55 @@ class RepositoryController( BaseUIController, common_util.ItemRatings ):
def browse_repository_dependencies( self, trans, **kwd ):
if 'operation' in kwd:
operation = kwd[ 'operation' ].lower()
# The received id is a RepositoryMetadata id.
repository_metadata_id = kwd[ 'id' ]
repository_metadata = suc.get_repository_metadata_by_id( trans, repository_metadata_id )
repository_id = trans.security.encode_id( repository_metadata.repository_id )
changeset_revision = repository_metadata.changeset_revision
new_kwd = dict( id=repository_id,
changeset_revision=changeset_revision )
if operation == "browse_repository":
return trans.response.send_redirect( web.url_for( controller='repository',
action='browse_repository',
**kwd ) )
**new_kwd ) )
if operation == "view_or_manage_repository":
return trans.response.send_redirect( web.url_for( controller='repository',
action='view_or_manage_repository',
**kwd ) )
**new_kwd ) )
return self.repository_dependencies_grid( trans, **kwd )
@web.expose
def browse_tools( self, trans, **kwd ):
if 'operation' in kwd:
operation = kwd[ 'operation' ].lower()
# The received id is a RepositoryMetadata id.
repository_metadata_id = kwd['id' ]
repository_metadata = suc.get_repository_metadata_by_id( trans, repository_metadata_id )
repository_id = trans.security.encode_id( repository_metadata.repository_id )
changeset_revision = repository_metadata.changeset_revision
new_kwd = dict( id=repository_id,
changeset_revision=changeset_revision )
if operation == "view_or_manage_repository":
return trans.response.send_redirect( web.url_for( controller='repository',
action='view_or_manage_repository',
**kwd ) )
**new_kwd ) )
return self.tools_grid( trans, **kwd )
@web.expose
def browse_tool_dependencies( self, trans, **kwd ):
if 'operation' in kwd:
operation = kwd[ 'operation' ].lower()
# The received id is a RepositoryMetadata id.
repository_metadata_id = kwd[ 'id' ]
repository_metadata = suc.get_repository_metadata_by_id( trans, repository_metadata_id )
repository_id = trans.security.encode_id( repository_metadata.repository_id )
changeset_revision = repository_metadata.changeset_revision
new_kwd = dict( id=repository_id,
changeset_revision=changeset_revision )
if operation == "view_or_manage_repository":
return trans.response.send_redirect( web.url_for( controller='repository',
action='view_or_manage_repository',
**kwd ) )
**new_kwd ) )
return self.tool_dependencies_grid( trans, **kwd )
@web.expose
lib/tool_shed/grids/repository_grids.py
+4 -4
View File
@@ -787,7 +787,7 @@ class RepositoryDependenciesGrid( RepositoryMetadataGrid ):
columns = [
RepositoryMetadataGrid.RepositoryNameColumn( "Repository name",
model_class=model.Repository,
link=( lambda item: dict( operation="view_or_manage_repository", id=item.repository.id, changeset_revision=item.changeset_revision ) ),
link=( lambda item: dict( operation="view_or_manage_repository", id=item.id ) ),
attach_popup=False,
key="Repository.name" ),
RepositoryMetadataGrid.RepositoryOwnerColumn( "Owner",
@@ -858,7 +858,7 @@ class ToolDependenciesGrid( RepositoryMetadataGrid ):
columns = [
RepositoryMetadataGrid.RepositoryNameColumn( "Repository name",
model_class=model.Repository,
link=( lambda item: dict( operation="view_or_manage_repository", id=item.repository.id, changeset_revision=item.changeset_revision ) ),
link=( lambda item: dict( operation="view_or_manage_repository", id=item.id ) ),
attach_popup=False,
key="Repository.name" ),
RepositoryMetadataGrid.RepositoryOwnerColumn( "Owner",
@@ -920,7 +920,7 @@ class ToolsGrid( RepositoryMetadataGrid ):
columns = [
RepositoryMetadataGrid.RepositoryNameColumn( "Repository name",
model_class=model.Repository,
link=( lambda item: dict( operation="view_or_manage_repository", id=item.repository.id, changeset_revision=item.changeset_revision ) ),
link=( lambda item: dict( operation="view_or_manage_repository", id=item.id ) ),
attach_popup=False,
key="Repository.name" ),
RepositoryMetadataGrid.RepositoryOwnerColumn( "Owner",
@@ -985,7 +985,7 @@ class DatatypesGrid( RepositoryMetadataGrid ):
columns = [
RepositoryMetadataGrid.RepositoryNameColumn( "Repository name",
model_class=model.Repository,
link=( lambda item: dict( operation="view_or_manage_repository", id=item.repository.id, changeset_revision=item.changeset_revision ) ),
link=( lambda item: dict( operation="view_or_manage_repository", id=item.id ) ),
attach_popup=False,
key="Repository.name" ),
RepositoryMetadataGrid.RepositoryOwnerColumn( "Owner",