entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 35 Releases Activity

api: consider user from query string in formdata api (#6812)

This commit is contained in:
Frédéric Péters 2015-03-24 22:09:46 +01:00
parent df40721a2f
commit c0a8588024
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wcs/forms/common.py
View File

@ -91,10 +91,13 @@ class FormStatusPage(Directory):
self._q_exports.append(name)
setattr(self, name, directory)
def check_auth(self):
def check_auth(self, api_call=False):
session = get_session()
mine = False
user = get_request().user
if api_call:
user = get_user_from_api_query_string() or get_request().user
else:
user = get_request().user
if user:
if user.anonymous:
anonylink = AnonymityLink.select(
@ -113,7 +116,7 @@ class FormStatusPage(Directory):
return mine
def json(self):
self.check_auth()
self.check_auth(api_call=True)
return self.export_to_json()
def receipt_message(self, mine=False):
@ -160,9 +163,9 @@ class FormStatusPage(Directory):
return r.getvalue()
def _q_index(self):
mine = self.check_auth()
if get_request().is_json():
return self.export_to_json()
mine = self.check_auth()
get_logger().info('form %s - id: %s - view' % (self.formdef.name, self.filled.id))
self.html_top(self.formdef.name)