hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-13 13:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing pre-commit errors

Browse Source
This commit is contained in:
Juan Cruz-Benito
2020-02-14 11:04:11 +01:00
parent 3d0da4f25a
commit 95c5ebb090
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
jupyterhub/handlers/pages.py
View File

@@ -10,10 +10,11 @@ from datetime import datetime
from http.client import responses from http.client import responses
from jinja2 import TemplateNotFound from jinja2 import TemplateNotFound
from python_paginate.web.tornado_paginate import Pagination
from tornado import gen from tornado import gen
from tornado import web from tornado import web
from tornado.httputil import url_concat, urlparse from tornado.httputil import url_concat
from python_paginate.web.tornado_paginate import Pagination from tornado.httputil import urlparse
from .. import __version__ from .. import __version__
from .. import orm from .. import orm
@@ -452,7 +453,13 @@ class AdminHandler(BaseHandler):
# get User.col.desc() order objects # get User.col.desc() order objects
ordered = [getattr(c, o)() for c, o in zip(cols, orders)] ordered = [getattr(c, o)() for c, o in zip(cols, orders)]
users = self.db.query(orm.User).outerjoin(orm.Spawner).order_by(*ordered).limit(per_page).offset(offset) users = (
self.db.query(orm.User)
.outerjoin(orm.Spawner)
.order_by(*ordered)
.limit(per_page)
.offset(offset)
)
users = [self._user_from_orm(u) for u in users] users = [self._user_from_orm(u) for u in users]
from itertools import chain from itertools import chain
@@ -461,10 +468,14 @@ class AdminHandler(BaseHandler):
running.extend(s for s in u.spawners.values() if s.active) running.extend(s for s in u.spawners.values() if s.active)
total = self.db.query(orm.User.id).count() total = self.db.query(orm.User.id).count()
pagination = Pagination(url=self.request.uri, total=total, record_name='users', pagination = Pagination(
url=self.request.uri,
total=total,
record_name='users',
display_msg='Displaying {record_name} <b>{start} - {end}</b>. Total {record_name}: {total}', display_msg='Displaying {record_name} <b>{start} - {end}</b>. Total {record_name}: {total}',
page=page, per_page=per_page) page=page,
per_page=per_page,
)
auth_state = await self.current_user.get_auth_state() auth_state = await self.current_user.get_auth_state()
html = self.render_template( html = self.render_template(
@@ -479,7 +490,7 @@ class AdminHandler(BaseHandler):
allow_named_servers=self.allow_named_servers, allow_named_servers=self.allow_named_servers,
named_server_limit_per_user=self.named_server_limit_per_user, named_server_limit_per_user=self.named_server_limit_per_user,
server_version='{} {}'.format(__version__, self.version_hash), server_version='{} {}'.format(__version__, self.version_hash),
pagination=pagination pagination=pagination,
) )
self.finish(html) self.finish(html)

2
requirements.txt
View File

@@ -9,8 +9,8 @@ pamela
prometheus_client>=0.0.21 prometheus_client>=0.0.21
psutil>=5.6.5; sys_platform == 'win32' psutil>=5.6.5; sys_platform == 'win32'
python-dateutil python-dateutil
python-paginate
requests requests
SQLAlchemy>=1.1 SQLAlchemy>=1.1
tornado>=5.0 tornado>=5.0
traitlets>=4.3.2 traitlets>=4.3.2
python-paginate