Mercurial > kallithea
changeset 7831:df05acbbfde0
summary: only show SSH clone URL if SSH is enabled and the user is authenticated
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 13 Aug 2019 21:51:03 +0200 |
| parents | ee4fc2d20d09 |
| children | 75b0d3fd6303 |
| files | kallithea/controllers/summary.py kallithea/templates/summary/summary.html |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/summary.py Mon Aug 12 20:53:56 2019 +0200 +++ b/kallithea/controllers/summary.py Tue Aug 13 21:51:03 2019 +0200 @@ -113,13 +113,16 @@ c.cs_comments = c.db_repo.get_comments(page_revisions) c.cs_statuses = c.db_repo.statuses(page_revisions) + c.ssh_repo_url = None if request.authuser.is_default_user: username = None else: username = request.authuser.username + if c.ssh_enabled: + c.ssh_repo_url = c.db_repo.clone_url(clone_uri_tmpl=c.clone_ssh_tmpl) + c.clone_repo_url = c.db_repo.clone_url(clone_uri_tmpl=c.clone_uri_tmpl, with_id=False, username=username) c.clone_repo_url_id = c.db_repo.clone_url(clone_uri_tmpl=c.clone_uri_tmpl, with_id=True, username=username) - c.ssh_repo_url = c.db_repo.clone_url(clone_uri_tmpl=c.clone_ssh_tmpl) if c.db_repo.enable_statistics: c.show_stats = True
--- a/kallithea/templates/summary/summary.html Mon Aug 12 20:53:56 2019 +0200 +++ b/kallithea/templates/summary/summary.html Tue Aug 13 21:51:03 2019 +0200 @@ -54,14 +54,14 @@ <label>${_('Clone URL')}:</label> <div id="clone-url"> <div id="clone_by_name" class="input-group" - %if c.ssh_enabled: + %if c.ssh_repo_url: style="display:none" %endif > <span class="input-group-addon">${self.repolabel(c.db_repo)}</span> <input class="form-control" size="80" readonly="readonly" value="${c.clone_repo_url}"/> <span class="input-group-addon btn use-id">${_('Use ID')}</span> - %if c.ssh_enabled: + %if c.ssh_repo_url: <span class="input-group-addon btn use-ssh">${_('Use SSH')}</span> %endif </div> @@ -69,11 +69,11 @@ <span class="input-group-addon">${self.repolabel(c.db_repo)}</span> <input class="form-control" size="80" readonly="readonly" value="${c.clone_repo_url_id}"/> <span class="input-group-addon btn use-name">${_('Use Name')}</span> - %if c.ssh_enabled: + %if c.ssh_repo_url: <span class="input-group-addon btn use-ssh">${_('Use SSH')}</span> %endif </div> - %if c.ssh_enabled: + %if c.ssh_repo_url: <div id="clone_ssh" class="input-group"> <span class="input-group-addon">${self.repolabel(c.db_repo)}</span> <input id="ssh_url" class="form-control" size="80" readonly="readonly" value="${c.ssh_repo_url}"/>