kallithea Changeset - e6e69ed2c89e

Changeset - e6e69ed2c89e

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 8 years ago 2017-08-27 17:11:03
mads@kiilerich.com

summary: inline _load_changelog_summary

It makes more sense to have this summary specific code in the summary
controller.

2 files changed with 9 insertions and 14 deletions:

kallithea/controllers/changelog.py

kallithea/controllers/summary.py

0 comments (0 inline, 0 general)

kallithea/controllers/changelog.py

➞

Show inline comments

@@ @@ -43,23 +43,12 @@ from kallithea.lib.vcs.exceptions import @@
 from kallithea.lib.utils2 import safe_int, safe_str
 log = logging.getLogger(__name__)
 def _load_changelog_summary():
     # only used from summary ...
     p = safe_int(request.GET.get('page'), 1)
     size = safe_int(request.GET.get('size'), 10)
     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)
 class ChangelogController(BaseRepoController):
     def _before(self, *args, **kwargs):
         super(ChangelogController, self)._before(*args, **kwargs)
         c.affected_files_cut_off = 60

kallithea/controllers/summary.py

➞

Show inline comments

@@ @@ -39,22 +39,22 @@ from webob.exc import HTTPBadRequest @@
 from beaker.cache import cache_region, region_invalidate
 from kallithea.lib.vcs.exceptions import ChangesetError, EmptyRepositoryError, \
     NodeDoesNotExistError
 from kallithea.config.conf import ALL_READMES, ALL_EXTS, LANGUAGES_EXTENSIONS_MAP
 from kallithea.model.db import Statistics, CacheInvalidation, User
 from kallithea.lib.utils2 import safe_str
+from kallithea.lib.utils2 import safe_int, safe_str
 from kallithea.lib.auth import LoginRequired, HasRepoPermissionLevelDecorator, \
     NotAnonymous
 from kallithea.lib.base import BaseRepoController, render, jsonify
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.markup_renderer import MarkupRenderer
 from kallithea.lib.celerylib.tasks import get_commits_stats
 from kallithea.lib.compat import json
 from kallithea.lib.vcs.nodes import FileNode
-from kallithea.controllers.changelog import _load_changelog_summary
+from kallithea.lib.page import RepoPage
 log = logging.getLogger(__name__)
 README_FILES = [''.join([x[0][0], x[1][0]]) for x in
                     sorted(list(itertools.product(ALL_READMES, ALL_EXTS)),
                            key=lambda y:y[0][1] + y[1][1])]
@@ @@ -103,13 +103,19 @@ class SummaryController(BaseRepoControll @@
             region_invalidate(_get_readme_from_cache, None, '_get_readme_from_cache', repo_name, kind)
         return _get_readme_from_cache(repo_name, kind)
     @LoginRequired()
     @HasRepoPermissionLevelDecorator('read')
     def index(self, repo_name):
         _load_changelog_summary()
         p = safe_int(request.GET.get('page'), 1)
         size = safe_int(request.GET.get('size'), 10)
         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)
         if request.authuser.is_default_user:
             username = ''
         else:
             username = safe_str(request.authuser.username)

0 comments (0 inline, 0 general)