Mercurial > kallithea

changeset 8783:07e664871e98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates: pass repo type to repolabel as str Keep it simple and avoid passing complex repo objects around.
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 09 Nov 2020 16:17:26 +0100
parents b7eaad593cb9
children f01bad8101e4
files kallithea/templates/base/base.html kallithea/templates/summary/summary.html
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/templates/base/base.html	Sat Nov 07 18:54:34 2020 +0100
+++ b/kallithea/templates/base/base.html	Mon Nov 09 16:17:26 2020 +0100
@@ -81,11 +81,11 @@
   </ul>
 </%def>
 
-<%def name="repolabel(repo)">
-  %if h.is_hg(repo):
+<%def name="repolabel(repo_type)">
+  %if repo_type == 'hg':
     <span class="label label-repo" title="${_('Mercurial repository')}">hg</span>
   %endif
-  %if h.is_git(repo):
+  %if repo_type == 'git':
     <span class="label label-repo" title="${_('Git repository')}">git</span>
   %endif
 </%def>
@@ -97,7 +97,7 @@
     <div class="container-fluid">
     <div class="navbar-header">
       <div class="navbar-brand">
-        ${repolabel(c.db_repo)}
+        ${repolabel(c.db_repo.repo_type)}
 
         ## public/private
         %if c.db_repo.private:
--- a/kallithea/templates/summary/summary.html	Sat Nov 07 18:54:34 2020 +0100
+++ b/kallithea/templates/summary/summary.html	Mon Nov 09 16:17:26 2020 +0100
@@ -55,7 +55,7 @@
                 <label>${_('Clone URL')}:</label>
                 <div id="clone-url">
                   <div id="clone_by_name" class="input-group" style="${'display:none' if c.ssh_repo_url else ''}">
-                    <span class="input-group-addon">${self.repolabel(c.db_repo)}</span>
+                    <span class="input-group-addon">${self.repolabel(c.db_repo.repo_type)}</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_repo_url:
@@ -63,7 +63,7 @@
                     %endif
                   </div>
                   <div id="clone_by_id" class="input-group" style="display:none">
-                    <span class="input-group-addon">${self.repolabel(c.db_repo)}</span>
+                    <span class="input-group-addon">${self.repolabel(c.db_repo.repo_type)}</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_repo_url:
@@ -72,7 +72,7 @@
                   </div>
                   %if c.ssh_repo_url:
                   <div id="clone_ssh" class="input-group">
-                    <span class="input-group-addon">${self.repolabel(c.db_repo)}</span>
+                    <span class="input-group-addon">${self.repolabel(c.db_repo.repo_type)}</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>