Merge pull request #1978 from getredash/patches

Fix #1950: record_event fails for api events

redash/handlers/base.py

@@ -44,14 +44,15 @@ def update_model(self, model, updates):
 
 
 def record_event(org, user, options):
-    if isinstance(user, ApiUser):
+    if user.is_api_user():
         options.update({
             'api_key': user.name,
             'org_id': org.id
         })
     else:
         options.update({
             'user_id': user.id,
+            'user_name': user.name,
             'org_id': org.id
         })
 
@@ -88,7 +89,7 @@ def paginate(query_set, page, page_size, serializer):
     if page < 1:
         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.')
 
     if page_size > 250 or page_size < 1: