valitydev/redash
14
0
Fork 0
mirror of https://github.com/valitydev/redash.git synced 2024-11-08 09:53:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1978 from getredash/patches

Browse Source 
Fix #1950: record_event fails for api events
This commit is contained in:
Arik Fraimovich 2017-09-27 18:08:57 +03:00 committed by GitHub
commit 505f338da9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
redash/handlers/base.py
View File

@ -44,7 +44,7 @@ class BaseResource(Resource):
def record_event(org, user, options): def record_event(org, user, options):
if isinstance(user, ApiUser): if user.is_api_user():
options.update({ options.update({
'api_key': user.name, 'api_key': user.name,
'org_id': org.id 'org_id': org.id
@ -52,6 +52,7 @@ def record_event(org, user, options):
else: else:
options.update({ options.update({
'user_id': user.id, 'user_id': user.id,
'user_name': user.name,
'org_id': org.id 'org_id': org.id
}) })
@ -88,7 +89,7 @@ def paginate(query_set, page, page_size, serializer):
if page < 1: if page < 1:
abort(400, message='Page must be positive integer.') abort(400, message='Page must be positive integer.')
if (page-1)*page_size+1 > count > 0: if (page - 1) * page_size + 1 > count > 0:
abort(400, message='Page is out of range.') abort(400, message='Page is out of range.')
if page_size > 250 or page_size < 1: if page_size > 250 or page_size < 1: