Mercurial > kallithea
comparison rhodecode/controllers/admin/admin.py @ 3700:3563bb7b4b82
merge with rc1
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 07 Apr 2013 18:37:22 +0200 |
parents | a5f0bc867edc 10b4e34841a4 |
children | 7efc8dcc0dc4 |
comparison
equal
deleted
inserted
replaced
3525:0cef54d34605 | 3700:3563bb7b4b82 |
---|---|
128 | 128 |
129 #FILTERING | 129 #FILTERING |
130 c.search_term = request.GET.get('filter') | 130 c.search_term = request.GET.get('filter') |
131 try: | 131 try: |
132 users_log = _journal_filter(users_log, c.search_term) | 132 users_log = _journal_filter(users_log, c.search_term) |
133 except: | 133 except Exception: |
134 # we want this to crash for now | 134 # we want this to crash for now |
135 raise | 135 raise |
136 | 136 |
137 users_log = users_log.order_by(UserLog.action_date.desc()) | 137 users_log = users_log.order_by(UserLog.action_date.desc()) |
138 | 138 |