1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/1d8578333bd3/ changeset: 1d8578333bd3 user: greg date: 2012-10-23 19:43:08 summary: Fix for RepositoriesWithReviewsGrid columns. affected #: 2 files
diff -r 7a0c93ca036bcd7a8ed33ed15dec95205974f46e -r 1d8578333bd37d7fd84f276d115f414bbde0b607 lib/galaxy/webapps/community/controllers/repository.py --- a/lib/galaxy/webapps/community/controllers/repository.py +++ b/lib/galaxy/webapps/community/controllers/repository.py @@ -120,20 +120,6 @@ elif len( select_field.options ) == 1: return select_field.options[ 0 ][ 0 ] return '' - class WithoutReviewsRevisionColumn( grids.GridColumn ): - def __init__( self, col_name ): - grids.GridColumn.__init__( self, col_name ) - def get_value( self, trans, grid, repository ): - # Restrict the options to revisions that have not yet been reviewed. - repository_metadata_revisions = get_repository_metadata_revisions_for_review( repository, reviewed=False ) - if repository_metadata_revisions: - rval = '' - for repository_metadata in repository_metadata_revisions: - rev, label, changeset_revision = get_rev_label_changeset_revision_from_repository_metadata( repository_metadata, repository=repository ) - rval += '<a href="manage_repository_reviews_of_revision' - rval += '?id=%s&changeset_revision=%s">%s</a><br/>' % ( trans.security.encode_id( repository.id ), changeset_revision, label ) - return rval - return '' class TipRevisionColumn( grids.GridColumn ): def __init__( self, col_name ): grids.GridColumn.__init__( self, col_name )
diff -r 7a0c93ca036bcd7a8ed33ed15dec95205974f46e -r 1d8578333bd37d7fd84f276d115f414bbde0b607 lib/galaxy/webapps/community/controllers/repository_review.py --- a/lib/galaxy/webapps/community/controllers/repository_review.py +++ b/lib/galaxy/webapps/community/controllers/repository_review.py @@ -51,8 +51,6 @@ class RepositoriesWithReviewsGrid( RepositoryGrid ): # This grid filters out repositories that have been marked as deprecated. class WithReviewsRevisionColumn( grids.GridColumn ): - def __init__( self, col_name ): - grids.GridColumn.__init__( self, col_name ) def get_value( self, trans, grid, repository ): # Restrict to revisions that have been reviewed. if repository.reviews: @@ -65,6 +63,18 @@ rval += '?id=%s&changeset_revision=%s">%s</a><br/>' % ( trans.security.encode_id( repository.id ), changeset_revision, label ) return rval return '' + class WithoutReviewsRevisionColumn( grids.GridColumn ): + def get_value( self, trans, grid, repository ): + # Restrict the options to revisions that have not yet been reviewed. + repository_metadata_revisions = get_repository_metadata_revisions_for_review( repository, reviewed=False ) + if repository_metadata_revisions: + rval = '' + for repository_metadata in repository_metadata_revisions: + rev, label, changeset_revision = get_rev_label_changeset_revision_from_repository_metadata( repository_metadata, repository=repository ) + rval += '<a href="manage_repository_reviews_of_revision' + rval += '?id=%s&changeset_revision=%s">%s</a><br/>' % ( trans.security.encode_id( repository.id ), changeset_revision, label ) + return rval + return '' class ReviewersColumn( grids.TextColumn ): def get_value( self, trans, grid, repository ): rval = '' @@ -84,7 +94,7 @@ link=( lambda item: dict( operation="view_or_manage_repository", id=item.id ) ), attach_popup=True ), WithReviewsRevisionColumn( "Reviewed revisions" ), - RepositoryGrid.WithoutReviewsRevisionColumn( "Revisions for review" ), + WithoutReviewsRevisionColumn( "Revisions for review" ), RepositoryGrid.UserColumn( "Owner", attach_popup=False ), ReviewersColumn( "Reviewers", attach_popup=False ) ]
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.