commit/galaxy-central: greg: Fixes for repositories in the tool shed whose repository tip changeset has no files (because they were all deleted) but have valid tools and other utilities in previous changeset revisions.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/f50a5a4391ee/ Changeset: f50a5a4391ee User: greg Date: 2014-02-12 16:17:38 Summary: Fixes for repositories in the tool shed whose repository tip changeset has no files (because they were all deleted) but have valid tools and other utilities in previous changeset revisions. Affected #: 2 files diff -r b8d2ef92592257a76abeba73630e71b44a708fa8 -r f50a5a4391ee589b55516c6d0fc94a9805840900 lib/galaxy/webapps/tool_shed/controllers/repository.py --- a/lib/galaxy/webapps/tool_shed/controllers/repository.py +++ b/lib/galaxy/webapps/tool_shed/controllers/repository.py @@ -2312,6 +2312,7 @@ revision_label = suc.get_revision_label( trans, repository, previous_changeset_revision, include_date=False ) metadata = repository_metadata.metadata is_malicious = repository_metadata.malicious + changeset_revision = previous_changeset_revision if repository_metadata: skip_tool_test = repository_metadata.skip_tool_tests if skip_tool_test: @@ -2719,10 +2720,15 @@ status = "error" repository_type_select_field = rt_util.build_repository_type_select_field( trans, repository=repository ) changeset_revision = repository.tip( trans.app ) + metadata = metadata_util.get_repository_metadata_by_repository_id_changeset_revision( trans, + id, + changeset_revision, + metadata_only=True ) return trans.fill_template( '/webapps/tool_shed/repository/browse_repository.mako', repo=repo, repository=repository, changeset_revision=changeset_revision, + metadata=metadata, commit_message=commit_message, repository_type_select_field=repository_type_select_field, message=message, diff -r b8d2ef92592257a76abeba73630e71b44a708fa8 -r f50a5a4391ee589b55516c6d0fc94a9805840900 templates/webapps/tool_shed/common/repository_actions_menu.mako --- a/templates/webapps/tool_shed/common/repository_actions_menu.mako +++ b/templates/webapps/tool_shed/common/repository_actions_menu.mako @@ -74,7 +74,7 @@ else: can_rate = False - if changeset_revision is not None: + if metadata is not None and changeset_revision is not None: if has_metadata and not is_deprecated and trans.app.security_agent.user_can_review_repositories( trans.user ): can_review_repository = True else: @@ -177,7 +177,7 @@ <a class="action-button" target="galaxy_main" href="${h.url_for( controller='repository', action='manage_repository_admins', id=trans.security.encode_id( repository.id ) )}">Manage repository administrators</a> %endif %if can_download: - %if changeset_revision is not None: + %if metadata is not None and changeset_revision is not None: <a class="action-button" href="${h.url_for( controller='repository', action='export', repository_id=trans.app.security.encode_id( repository.id ), changeset_revision=changeset_revision )}">Export this revision</a> %endif <a class="action-button" href="${h.url_for( controller='repository', action='download', repository_id=trans.app.security.encode_id( repository.id ), changeset_revision=repository.tip( trans.app ), file_type='gz' )}">Download as a .tar.gz file</a> 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.
participants (1)
-
commits-noreply@bitbucket.org