Mercurial > kallithea

changeset 2133:e1a54d600c89 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#402 removed group prefix from repository name when listing repositories inside a group
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 17 Mar 2012 14:43:25 +0200
parents 9f5582151d53
children 052357653dc9
files docs/changelog.rst rhodecode/templates/_data_table/_dt_elements.html rhodecode/templates/admin/repos_groups/repos_groups.html rhodecode/templates/index.html rhodecode/templates/index_base.html
diffstat 5 files changed, 14 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/docs/changelog.rst	Fri Mar 16 23:58:05 2012 +0200
+++ b/docs/changelog.rst	Sat Mar 17 14:43:25 2012 +0200
@@ -25,6 +25,8 @@
   inside a repository group
 - added alternative HTTP 403 response when client failed to authenticate. Helps 
   solving issues with Mercurial and LDAP
+- #402 removed group prefix from repository name when listing repositories 
+  inside a group
 
 fixes
 +++++
--- a/rhodecode/templates/_data_table/_dt_elements.html	Fri Mar 16 23:58:05 2012 +0200
+++ b/rhodecode/templates/_data_table/_dt_elements.html	Sat Mar 17 14:43:25 2012 +0200
@@ -40,7 +40,14 @@
   </ul>
 </%def>
 
-<%def name="repo_name(name,rtype,private,fork_of)">
+<%def name="repo_name(name,rtype,private,fork_of,short_name=False)">
+    <%
+    def get_name(name,short_name=short_name):
+      if short_name:
+        return name.split('/')[-1]
+      else:
+        return name
+    %>
   <div style="white-space: nowrap">
    ##TYPE OF REPO
    %if h.is_hg(rtype):
@@ -57,7 +64,7 @@
    %endif
 
    ##NAME
-   ${h.link_to(name,h.url('summary_home',repo_name=name),class_="repo_name")}
+   ${h.link_to(get_name(name),h.url('summary_home',repo_name=name),class_="repo_name")}
    %if fork_of:
         <a href="${h.url('summary_home',repo_name=fork_of)}">
         <img class="icon" alt="${_('fork')}" title="${_('Fork of')} ${fork_of}" src="${h.url('/images/icons/arrow_divide.png')}"/></a>
--- a/rhodecode/templates/admin/repos_groups/repos_groups.html	Fri Mar 16 23:58:05 2012 +0200
+++ b/rhodecode/templates/admin/repos_groups/repos_groups.html	Sat Mar 17 14:43:25 2012 +0200
@@ -17,5 +17,5 @@
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
-        <%include file="/index_base.html" args="parent=self"/>
+        <%include file="/index_base.html" args="parent=self,short_repo_names=True"/>
 </%def>
--- a/rhodecode/templates/index.html	Fri Mar 16 23:58:05 2012 +0200
+++ b/rhodecode/templates/index.html	Sat Mar 17 14:43:25 2012 +0200
@@ -4,5 +4,5 @@
 <%def name="breadcrumbs()"></%def>
 <%def name="page_nav()">${self.menu('home')}</%def>
 <%def name="main()">
-    	<%include file="index_base.html" args="parent=self"/>
+   <%include file="index_base.html" args="parent=self"/>
 </%def>
--- a/rhodecode/templates/index_base.html	Fri Mar 16 23:58:05 2012 +0200
+++ b/rhodecode/templates/index_base.html	Sat Mar 17 14:43:25 2012 +0200
@@ -81,7 +81,7 @@
                     </td>
                     ##REPO NAME AND ICONS
                     <td class="reponame">
-                      ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],repo['dbrepo_fork'].get('repo_name'))}
+                      ${dt.repo_name(repo['name'],repo['dbrepo']['repo_type'],repo['dbrepo']['private'],repo['dbrepo_fork'].get('repo_name'),pageargs.get('short_repo_names'))}
                     </td>
                     ##DESCRIPTION
                     <td><span class="tooltip" title="${h.tooltip(repo['description'])}">