From d9487570c867b203d1d1cc8a22b2faf936ea062f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sun, 20 May 2018 23:35:21 +0200
Subject: [PATCH 2/3] trivial: remove leftover logging code from old prefill
 mode (#23975)

---
 wcs/backoffice/submission.py |  4 ++--
 wcs/forms/root.py            | 17 +++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/wcs/backoffice/submission.py b/wcs/backoffice/submission.py
index 48641061..25d15e9d 100644
--- a/wcs/backoffice/submission.py
+++ b/wcs/backoffice/submission.py
@@ -157,7 +157,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">')
@@ -168,7 +168,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 mark_safe(str(r.getvalue()))
 
diff --git a/wcs/forms/root.py b/wcs/forms/root.py
index 8e3ad5fd..d2abe0af 100644
--- a/wcs/forms/root.py
+++ b/wcs/forms/root.py
@@ -231,13 +231,10 @@ class FormPage(Directory, FormTemplateMixin):
                 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
@@ -285,7 +282,7 @@ class FormPage(Directory, FormTemplateMixin):
         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):
         displayed_fields = []
 
         session = get_session()
@@ -410,14 +407,14 @@ class FormPage(Directory, FormTemplateMixin):
         context = {
             'view': self,
             'form': form,
-            'form_side': self.form_side(0, page_no, log_detail=log_detail, data=data, magictoken=magictoken)
+            'form_side': self.form_side(0, page_no, data=data, magictoken=magictoken)
         }
 
         return template.render(
                 list(self.get_formdef_template_variants(self.filling_templates)),
                 context)
 
-    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)
@@ -427,7 +424,7 @@ class FormPage(Directory, FormTemplateMixin):
             # 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 mark_safe(str(r.getvalue()))
 
@@ -509,7 +506,7 @@ class FormPage(Directory, FormTemplateMixin):
                     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:
-- 
2.17.0