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

trivial: remove leftover logging code from old prefill mode (#23975)

This commit is contained in:
Frédéric Péters 2018-05-20 23:35:21 +02:00
parent 149fd04a50
commit b6aa07137a
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wcs/backoffice/submission.py
View File

@ -152,7 +152,7 @@ class FormFillPage(PublicFormFillPage):
form.add_hidden('submission_channel', self.selected_submission_channel)
return form
def form_side(self, step_no, page_no, log_detail=None, data=None, magictoken=None):
def form_side(self, step_no, page_no, data=None, magictoken=None):
r = TemplateIO(html=True)
get_response().filter['sidebar'] = self.get_sidebar(data)
r += htmltext('<div id="appbar">')
@ -163,7 +163,7 @@ class FormFillPage(PublicFormFillPage):
r += htmltext('<a rel="popup" href="remove/%s">%s</a>') % (draft_formdata_id, _('Delete this form'))
r += htmltext('</div>')
r += htmltext('<div id="side">')
r += self.step(step_no, page_no, log_detail, data=data)
r += self.step(step_no, page_no, data=data)
r += htmltext('</div> <!-- #side -->')
return r.getvalue()

17
wcs/forms/root.py
View File

@ -225,13 +225,10 @@ class FormPage(Directory):
return True
return False
def step(self, step_no, page_no, log_detail=None, data=None):
def step(self, step_no, page_no, data=None):
if step_no == 0:
self.substvars['current_page_no'] = str(page_no + 1)
if log_detail:
get_logger().info('form %s - step %s (%s)' % (self.formdef.name, step_no, log_detail))
else:
get_logger().info('form %s - step %s' % (self.formdef.name, step_no))
get_logger().info('form %s - step %s' % (self.formdef.name, step_no))
page_labels = []
current_position = 1
@ -279,7 +276,7 @@ class FormPage(Directory):
r += htmltext('</ol></div>')
return r.getvalue()
def page(self, page_no, page_change=True, log_detail=None, page_error_messages=None):
def page(self, page_no, page_change=True, page_error_messages=None):
r = TemplateIO(html=True)
displayed_fields = []
@ -387,7 +384,7 @@ class FormPage(Directory):
form.get_widget('f%s' % field.id).prefill_attributes = field.get_prefill_attributes()
self.html_top(self.formdef.name)
r += self.form_side(0, page_no, log_detail=log_detail, data=data, magictoken=magictoken)
r += self.form_side(0, page_no, data=data, magictoken=magictoken)
r += get_session().display_message()
form.add_hidden('step', '0')
@ -401,7 +398,7 @@ class FormPage(Directory):
r += form.render()
return r.getvalue()
def form_side(self, step_no, page_no, log_detail=None, data=None, magictoken=None):
def form_side(self, step_no, page_no, data=None, magictoken=None):
'''Create the elements that typically appear aside the main form
(tracking code and steps).'''
r = TemplateIO(html=True)
@ -411,7 +408,7 @@ class FormPage(Directory):
# data (e.g. the user is not on a insufficient authenticiation
# context page)
r += self.tracking_code_box(data, magictoken)
r += self.step(step_no, page_no, log_detail, data=data)
r += self.step(step_no, page_no, data=data)
r += htmltext('</div> <!-- #side -->')
return r.getvalue()
@ -493,7 +490,7 @@ class FormPage(Directory):
root_url, _('Login with %s') % auth_contexts[auth_context])
return r.getvalue()
def _q_index(self, log_detail=None):
def _q_index(self):
self.check_role()
authentication_context_check_result = self.check_authentication_context()
if authentication_context_check_result: