kallithea Changeset - a6af26b5ffc1

Changeset - a6af26b5ffc1

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Mads Kiilerich - 9 years ago 2016-11-10 16:10:41
madski@unity3d.com

repositories: backend cleanups related to breadcrumbs

6 files changed with 19 insertions and 51 deletions:

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/changelog.py

kallithea/controllers/home.py

kallithea/model/db.py

kallithea/model/repo.py

kallithea/templates/index.html

0 comments (0 inline, 0 general)

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -295,23 +295,18 @@ class RepoGroupsController(BaseControlle @@
     @HasRepoGroupPermissionAnyDecorator('group.read', 'group.write',
                                          'group.admin')
     def show(self, group_name):
         c.active = 'settings'
         c.group = c.repo_group = RepoGroupModel()._get_repo_group(group_name)
         c.group_repos = c.group.repositories.all()
         #overwrite our cached list with current filter
         c.repo_cnt = 0
         groups = RepoGroup.query(sorted=True).filter_by(parent_group=c.group).all()
         c.groups = self.scm_model.get_repo_groups(groups)
         c.repos_list = Repository.query(sorted=True).filter_by(group=c.group).all()
         repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
         repos_list = Repository.query(sorted=True).filter_by(group=c.group).all()
         repos_data = RepoModel().get_repos_as_dict(repos_list=repos_list,
                                                    admin=False, short_name=True)
         #json used to render the grid
         c.data = json.dumps(repos_data)
         return render('admin/repo_groups/repo_group_show.html')

kallithea/controllers/changelog.py

➞

Show inline comments

@@ @@ -45,12 +45,13 @@ from kallithea.lib.utils2 import safe_in @@
 log = logging.getLogger(__name__)
 def _load_changelog_summary():
     # also used from summary ...
     p = safe_int(request.GET.get('page'), 1)
     size = safe_int(request.GET.get('size'), 10)
     def url_generator(**kw):
         return url('changelog_summary_home',
                    repo_name=c.db_repo.repo_name, size=size, **kw)

kallithea/controllers/home.py

➞

Show inline comments

@@ @@ -54,15 +54,15 @@ class HomeController(BaseController): @@
     @LoginRequired()
     def index(self):
         c.groups = self.scm_model.get_repo_groups()
         c.group = None
-        c.repos_list = Repository.query(sorted=True).filter_by(group=None).all()
         repos_list = Repository.query(sorted=True).filter_by(group=None).all()
-        repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list,
         repos_data = RepoModel().get_repos_as_dict(repos_list=repos_list,
                                                    admin=False, short_name=True)
         #json used to render the grid
         c.data = json.dumps(repos_data)
         return render('/index.html')

kallithea/model/db.py

➞

Show inline comments

@@ @@ -1168,30 +1168,20 @@ class Repository(Base, BaseDbModel): @@
     def just_name(self):
         return self.repo_name.split(Repository.url_sep())[-1]
     @property
     def groups_with_parents(self):
         groups = []
         if self.group is None:
         group = self.group
         while group is not None:
             groups.append(group)
             group = group.parent_group
             assert group not in groups, group # avoid recursion on bad db content
         groups.reverse()
             return groups
         cur_gr = self.group
         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, self.repo_name
     @LazyProperty
     def repo_path(self):
         """
         Returns base full path for that repository means where it actually
         exists on a filesystem
         """
@@ @@ -1586,32 +1576,19 @@ class RepoGroup(Base, BaseDbModel): @@
+                            )
+            )
         return gr.scalar()
     @property
     def parents(self):
         parents_recursion_limit = 10
         groups = []
         if self.parent_group is None:
             return groups
         cur_gr = self.parent_group
         groups.insert(0, cur_gr)
         cnt = 0
         while 1:
             cnt += 1
             gr = getattr(cur_gr, 'parent_group', None)
             cur_gr = cur_gr.parent_group
             if gr is None:
                 break
             if cnt == parents_recursion_limit:
                 # this will prevent accidental infinite loops
                 log.error(('more than %s parents found for group %s, stopping '
                            'recursive parent fetching' % (parents_recursion_limit, self)))
                 break
             groups.insert(0, gr)
         group = self.parent_group
         while group is not None:
             groups.append(group)
             group = group.parent_group
             assert group not in groups, group # avoid recursion on bad db content
         groups.reverse()
         return groups
     @property
     def children(self):
         return RepoGroup.query().filter(RepoGroup.parent_group == self)

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -267,16 +267,14 @@ class RepoModel(BaseModel): @@
         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_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)
         defaults['repo_name'] = repo_info.just_name
         defaults['repo_group'] = repo_info.group_id
         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

kallithea/templates/index.html

➞

Show inline comments

@@ @@ -2,15 +2,12 @@ @@
 <%inherit file="base/base.html"/>
 <%block name="title">
     ${_('Dashboard')}
 </%block>
 <%def name="breadcrumbs()">
 </%def>
 <%block name="header_menu">
 ${self.menu('repositories')}
 </%block>
 <%def name="main()">
    <%include file="index_base.html" args="parent=self"/>

0 comments (0 inline, 0 general)