engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webhelpers: replaced paginate library with custom lib

Browse source
This commit is contained in:
Daniel Dourvaris 2019-11-21 20:37:17 +01:00
parent 4057ada739
commit dbac62326d
26 changed files with 1167 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rhodecode/integrations/views.py
View file

@ -27,11 +27,11 @@ from pyramid.httpexceptions import HTTPFound, HTTPForbidden, HTTPNotFound
from rhodecode.integrations import integration_type_registry
from rhodecode.apps._base import BaseAppView
from rhodecode.apps._base.navigation import navigation_list
from rhodecode.lib.paginate import PageURL
from rhodecode.lib.auth import (
LoginRequired, CSRFRequired, HasPermissionAnyDecorator,
HasRepoPermissionAnyDecorator, HasRepoGroupPermissionAnyDecorator)
from rhodecode.lib.utils2 import safe_int
from rhodecode.lib.helpers import Page
from rhodecode.lib import helpers as h
from rhodecode.model.db import Repository, RepoGroup, Session, Integration
from rhodecode.model.scm import ScmModel
@ -219,11 +219,16 @@ class IntegrationSettingsViewBase(BaseAppView):
key=lambda x: getattr(x[1], sort_field),
reverse=(sort_dir == 'desc'))
page_url = PageURL(self.request.path, self.request.GET)
def url_generator(page_num):
query_params = {
'page': page_num
}
return self.request.current_route_path(_query=query_params)
page = safe_int(self.request.GET.get('page', 1), 1)
integrations = h.Page(
integrations, page=page, items_per_page=10, url=page_url)
integrations = Page(
integrations, page=page, items_per_page=10, url_maker=url_generator)
c.rev_sort_dir = sort_dir != 'desc' and 'desc' or 'asc'