kallithea Changeset - df05acbbfde0

Changeset - df05acbbfde0

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 6 years ago 2019-08-13 21:51:03
mads@kiilerich.com

Grafted from: 4664b02ec03c

summary: only show SSH clone URL if SSH is enabled and the user is authenticated

2 files changed with 8 insertions and 5 deletions:

kallithea/controllers/summary.py

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/controllers/summary.py

➞

Show inline comments

@@ @@ -110,19 +110,22 @@ class SummaryController(BaseRepoControll @@
         collection = c.db_repo_scm_instance
         c.cs_pagination = RepoPage(collection, page=p, items_per_page=size)
         page_revisions = [x.raw_id for x in list(c.cs_pagination)]
         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
         else:
             c.show_stats = False

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -51,32 +51,32 @@ ${self.repo_context_bar('summary')} @@
     <div id="summary-panel-body" class="form panel-body">
         <div id="summary" class="pull-left">
             <div class="form-group form-inline">
                 <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>
                   <div id="clone_by_id" class="input-group" style="display:none">
                     <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}"/>
                     <span class="input-group-addon btn use-name">${_('Use HTTP')}</span>
                   </div>
                   %endif

0 comments (0 inline, 0 general)