diff --git a/lib/galaxy/webapps/tool_shed/controllers/repository.py b/lib/galaxy/webapps/tool_shed/controllers/repository.py index 240fedbc819..e50e839f797 100644 --- a/lib/galaxy/webapps/tool_shed/controllers/repository.py +++ b/lib/galaxy/webapps/tool_shed/controllers/repository.py @@ -2252,6 +2252,8 @@ class RepositoryController( BaseUIController, ratings_util.ItemRatings ): repo = hg_util.get_repo_for_repository( trans.app, repository=None, repo_path=repo_dir, create=False ) repo_name = kwd.get( 'repo_name', repository.name ) changeset_revision = kwd.get( 'changeset_revision', repository.tip( trans.app ) ) + repository.share_url = suc.generate_sharable_link_for_repository_in_tool_shed( repository, changeset_revision=changeset_revision ) + repository.clone_url = common_util.generate_clone_url_for_repository_in_tool_shed( trans.user, repository ) remote_repository_url = kwd.get( 'remote_repository_url', repository.remote_repository_url ) homepage_url = kwd.get( 'homepage_url', repository.homepage_url ) description = kwd.get( 'description', repository.description ) @@ -3297,6 +3299,8 @@ class RepositoryController( BaseUIController, ratings_util.ItemRatings ): repo = hg_util.get_repo_for_repository( trans.app, repository=repository, repo_path=None, create=False ) avg_rating, num_ratings = self.get_ave_item_rating_data( trans.sa_session, repository, webapp_model=trans.model ) changeset_revision = kwd.get( 'changeset_revision', repository.tip( trans.app ) ) + repository.share_url = suc.generate_sharable_link_for_repository_in_tool_shed( repository, changeset_revision=changeset_revision ) + repository.clone_url = common_util.generate_clone_url_for_repository_in_tool_shed( trans.user, repository ) display_reviews = kwd.get( 'display_reviews', False ) alerts = kwd.get( 'alerts', '' ) alerts_checked = CheckboxField.is_checked( alerts ) diff --git a/templates/webapps/tool_shed/repository/common.mako b/templates/webapps/tool_shed/repository/common.mako index a18fd700149..b63cb96be6a 100644 --- a/templates/webapps/tool_shed/repository/common.mako +++ b/templates/webapps/tool_shed/repository/common.mako @@ -1,6 +1,7 @@ <%def name="common_javascripts(repository)"> %def> @@ -210,16 +219,13 @@ from tool_shed.util.shed_util_common import generate_sharable_link_for_repository_in_tool_shed sharable_link = generate_sharable_link_for_repository_in_tool_shed( repository, changeset_revision=changeset_revision ) %> - ${sharable_link} + ${ sharable_link } %def> -<%def name="render_clone_str( repository )"> - <% +<%def name="render_clone_str( repository )"><% from tool_shed.util.common_util import generate_clone_url_for_repository_in_tool_shed clone_str = generate_clone_url_for_repository_in_tool_shed( trans.user, repository ) - %> - hg clone ${clone_str} -%def> + %>hg clone ${ clone_str }%def> <%def name="render_folder( folder, folder_pad, parent=None, row_counter=None, is_root_folder=False, render_repository_actions_for='tool_shed' )"> <% diff --git a/templates/webapps/tool_shed/repository/manage_repository.mako b/templates/webapps/tool_shed/repository/manage_repository.mako index 79fa0ef7355..3982b68a48e 100644 --- a/templates/webapps/tool_shed/repository/manage_repository.mako +++ b/templates/webapps/tool_shed/repository/manage_repository.mako @@ -157,49 +157,32 @@ ${render_tool_shed_repository_actions( repository, metadata=metadata, changeset_
%endif