Mercurial > kallithea
diff rhodecode/controllers/admin/admin.py @ 2854:d998cc84cf72 rhodecode-0.0.1.4.2
Merge branch beta into stable
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Wed, 19 Sep 2012 22:38:12 +0200 |
parents | 63e58ef80ef1 6b176c679896 |
children | a5f0bc867edc |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/admin.py Sat Sep 08 00:39:00 2012 +0200 +++ b/rhodecode/controllers/admin/admin.py Wed Sep 19 22:38:12 2012 +0200 @@ -32,6 +32,7 @@ from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator from rhodecode.lib.base import BaseController, render from rhodecode.model.db import UserLog +from rhodecode.lib.utils2 import safe_int log = logging.getLogger(__name__) @@ -50,7 +51,7 @@ .options(joinedload(UserLog.repository))\ .order_by(UserLog.action_date.desc()) - p = int(request.params.get('page', 1)) + p = safe_int(request.params.get('page', 1), 1) c.users_log = Page(users_log, page=p, items_per_page=10) c.log_data = render('admin/admin_log.html')