0002-trivial-remove-leftover-logging-code-from-old-prefil.patch

Frédéric Péters, 22 mai 2018 09:08

Voir les différences: en ligne côte à côte

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(-)

                 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">')
-...
                     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()))

                     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
-...
             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()
-...
             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)
-...
                 # 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()))
-...
                         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:
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0002-trivial-remove-leftover-logging-code-from-old-prefil.patch