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

Merge pull request #2099 from davebx/shed_model_trim

Browse Source 
Consolidate duplicated method in tool_shed/model.
This commit is contained in:
John Chilton
2016-04-08 13:21:59 -04:00
parent 0d616af28a 4b8b7b4647
commit ce27863086
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/tool_shed/api/repositories.py
+1 -1
View File
@@ -117,7 +117,7 @@ class RepositoriesController( BaseAPIController ):
error_message += "invalid parameters received."
log.debug( error_message )
return []
return repository.ordered_installable_revisions( self.app )
return [ revision[ 1 ] for revision in repository.installable_revisions( self.app, sort_revisions=True ) ]
@web.expose_api_anonymous
def get_repository_revision_install_info( self, trans, name, owner, changeset_revision, **kwd ):
lib/galaxy/webapps/tool_shed/model/__init__.py
+4 -5
View File
@@ -250,17 +250,16 @@ class Repository( object, Dictifiable ):
return downloadable_revision.metadata.get( 'tool_dependencies', [] )
return []
def installable_revisions( self, app ):
return suc.get_metadata_revisions( self, hg.repository( ui.ui(), self.repo_path( app ) ), sort_revisions=True )
def installable_revisions( self, app, sort_revisions=True ):
return suc.get_metadata_revisions( self,
hg.repository( ui.ui(), self.repo_path( app ) ),
sort_revisions=sort_revisions )
def is_new( self, app ):
repo = hg.repository( ui.ui(), self.repo_path( app ) )
tip_ctx = repo.changectx( repo.changelog.tip() )
return tip_ctx.rev() < 0
def ordered_installable_revisions( self, app ):
return [ revision[ 1 ] for revision in suc.get_metadata_revisions( self, hg.repository( ui.ui(), self.repo_path( app ) ), downloadable=True ) ]
def repo_path( self, app ):
return app.hgweb_config_manager.get_entry( os.path.join( "repos", self.user.username, self.name ) )