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

Fix pagination with named servers

Browse Source
This commit is contained in:
Rollin Thomas
2021-01-15 11:19:57 -08:00
parent adb5f6ab2a
commit b73eca91ca
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jupyterhub/handlers/pages.py
View File

@@ -501,20 +501,16 @@ 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 = ( query = self.db.query(orm.User).outerjoin(orm.Spawner).distinct(orm.User.id)
self.db.query(orm.User)
.outerjoin(orm.Spawner) users = query.order_by(*ordered).limit(per_page).offset(offset)
.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]
running = [] running = []
for u in users: for u in users:
running.extend(s for s in u.spawners.values() if s.active) running.extend(s for s in u.spawners.values() if s.active)
pagination.total = self.db.query(orm.User.id).count() pagination.total = query.count()
auth_state = await self.current_user.get_auth_state() auth_state = await self.current_user.get_auth_state()
html = await self.render_template( html = await self.render_template(