kallithea Changeset - 8087731920d8

Changeset - 8087731920d8

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Mads Kiilerich - 13 years ago 2013-03-26 15:53:11
madski@unity3d.com

breadcrumbs: make repo names link to summary pages

4 files changed with 8 insertions and 12 deletions:

rhodecode/lib/helpers.py

rhodecode/model/db.py

rhodecode/model/repo.py

rhodecode/templates/base/base.html

0 comments (0 inline, 0 general)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -908,47 +908,43 @@ def changed_tooltip(nodes): @@
     """
     if nodes:
         pref = ': <br/> '
         suf = ''
         if len(nodes) > 30:
             suf = '<br/>' + _(' and %s more') % (len(nodes) - 30)
         return literal(pref + '<br/> '.join([safe_unicode(x.path)
                                              for x in nodes[:30]]) + suf)
     else:
         return ': ' + _('No Files')
-def repo_link(groups_and_repos, last_url=None):
 def repo_link(groups_and_repos):
     """
     Makes a breadcrumbs link to repo within a group
     joins &raquo; on each group to create a fancy link
     ex::
         group >> subgroup >> repo
     :param groups_and_repos:
     :param last_url:
     """
     groups, repo_name = groups_and_repos
     last_link = link_to(repo_name, last_url) if last_url else repo_name
     groups, just_name, repo_name = groups_and_repos
     last_url = url('summary_home', repo_name=repo_name)
     last_link = link_to(just_name, last_url)
     if not groups:
         if last_url:
             return literal('<span>%s</span>' % last_link)
         return literal('<span>%s</span>' % repo_name)
     else:
         def make_link(group):
             return link_to(group.name,
                            url('repos_group_home', group_name=group.group_name))
-        return literal(' &raquo; '.join(map(make_link, groups) + ['<span>' + last_link + '</span>']))
+    return literal(' &raquo; '.join(map(make_link, groups) + ['<span>%s</span>' % last_link]))
 def fancy_file_stats(stats):
     """
     Displays a fancy two colored bar for number of added/deleted
     lines of code on file
     :param stats: two element list of added/deleted lines of code
     """
     def cgen(l_type, a_v, d_v):
         mapping = {'tr': 'top-right-rounded-corner-mid',
                    'tl': 'top-left-rounded-corner-mid',

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -878,25 +878,25 @@ class Repository(Base, BaseModel): @@
         groups.insert(0, cur_gr)
         while 1:
             gr = getattr(cur_gr, 'parent_group', None)
             cur_gr = cur_gr.parent_group
             if gr is None:
                 break
             groups.insert(0, gr)
         return groups
     @property
     def groups_and_repo(self):
         return self.groups_with_parents, self.just_name
+        return self.groups_with_parents, self.just_name, self.repo_name
     @LazyProperty
     def repo_path(self):
         """
         Returns base full path for that repository means where it actually
         exists on a filesystem
         """
         q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key ==
                                               Repository.url_sep())
         q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
         return q.one().ui_value

rhodecode/model/repo.py

➞

Show inline comments

@@ @@ -231,25 +231,25 @@ class RepoModel(BaseModel): @@
         Get's information about repository, and returns a dict for
         usage in forms
         :param repo_name:
         """
         repo_info = Repository.get_by_repo_name(repo_name)
         if repo_info is None:
             return None
         defaults = repo_info.get_dict()
         group, repo_name = repo_info.groups_and_repo
+        group, repo_name, repo_name_full = repo_info.groups_and_repo
         defaults['repo_name'] = repo_name
         defaults['repo_group'] = getattr(group[-1] if group else None,
                                          'group_id', None)
         for strip, k in [(0, 'repo_type'), (1, 'repo_enable_downloads'),
                   (1, 'repo_description'), (1, 'repo_enable_locking'),
                   (1, 'repo_landing_rev'), (0, 'clone_uri'),
                   (1, 'repo_private'), (1, 'repo_enable_statistics')]:
             attr = k
             if strip:
                 attr = remove_prefix(k, 'repo_')

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -97,25 +97,25 @@ @@
   %>
   <%
     def is_current(selected):
         if selected == current:
             return h.literal('class="current"')
     %>
   <!--- CONTEXT BAR -->
   <div id="context-bar" class="box">
     <div id="context-top">
       <div id="breadcrumbs">
         ${h.link_to(_(u'Repositories'),h.url('home'))}
-        »
+        &raquo;
         ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
       </div>
       ## TODO: this check feels wrong, it would be better to have a check for permissions
       ## also it feels like a job for the controller
       %if c.rhodecode_user.username != 'default':
         <ul id="context-actions" class="horizontal-list">
           <li>
            <button class="${follow_class()}" onclick="javascript:toggleFollowingRepo(this,${c.rhodecode_db_repo.repo_id},'${str(h.get_token())}');">
             <!--span class="icon show-follow follow"></span>
             <span class="icon show-following following"></span-->
             <span class="show-follow">${_('Follow')}</span>
             <span class="show-following">${_('Unfollow')}</span>

0 comments (0 inline, 0 general)