# HG changeset patch # User Mads Kiilerich # Date 1503846057 -7200 # Node ID dbc009ab5af37ea8992eb13b2decff515469490e # Parent 4f3447149c983337b08d6258fc1822881b414015 summary: drop the in-page paging and replace it with simpler page reload This makes code and future refactorings simpler, and it only losses a little bit of nice-ness. diff -r 4f3447149c98 -r dbc009ab5af3 kallithea/config/routing.py --- a/kallithea/config/routing.py Sun Aug 27 16:39:35 2017 +0200 +++ b/kallithea/config/routing.py Sun Aug 27 17:00:57 2017 +0200 @@ -702,10 +702,6 @@ rmap.connect('changelog_home', '/{repo_name:.*?}/changelog', controller='changelog', conditions=dict(function=check_repo)) - rmap.connect('changelog_summary_home', '/{repo_name:.*?}/changelog_summary', - controller='changelog', action='changelog_summary', - conditions=dict(function=check_repo)) - rmap.connect('changelog_file_home', '/{repo_name:.*?}/changelog/{revision}/{f_path:.*}', controller='changelog', f_path=None, conditions=dict(function=check_repo)) diff -r 4f3447149c98 -r dbc009ab5af3 kallithea/controllers/changelog.py --- a/kallithea/controllers/changelog.py Sun Aug 27 16:39:35 2017 +0200 +++ b/kallithea/controllers/changelog.py Sun Aug 27 17:00:57 2017 +0200 @@ -50,16 +50,8 @@ # only 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) - collection = c.db_repo_scm_instance - - c.cs_pagination = RepoPage(collection, page=p, - items_per_page=size, - url=url_generator) + 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) @@ -183,12 +175,3 @@ c.cs = c.db_repo_scm_instance.get_changeset(cs) return render('changelog/changelog_details.html') raise HTTPNotFound() - - @LoginRequired() - @HasRepoPermissionLevelDecorator('read') - def changelog_summary(self, repo_name): - if request.environ.get('HTTP_X_PARTIAL_XHR'): - _load_changelog_summary() - - return render('changelog/changelog_summary_data.html') - raise HTTPNotFound() diff -r 4f3447149c98 -r dbc009ab5af3 kallithea/templates/summary/summary.html --- a/kallithea/templates/summary/summary.html Sun Aug 27 16:39:35 2017 +0200 +++ b/kallithea/templates/summary/summary.html Sun Aug 27 17:00:57 2017 +0200 @@ -369,15 +369,4 @@ %endif -## Shortlog paging - -