0001-forms-add-an-explicit-discard-button-instead-of-canc.patch

Frédéric Péters, 03 juin 2019 16:41

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

Subject: [PATCH] forms: add an explicit discard button (instead of "cancel")
 (#33026)

 tests/test_form_pages.py | 98 ++++++++++++++++++++++++++++++++++++++++
 wcs/forms/root.py        | 22 +++++++--
 2 files changed, 116 insertions(+), 4 deletions(-)

         assert resp.location == 'http://example.net/'
         assert formdef.data_class().count() == 0
     def test_form_discard_draft(pub):
         user = create_user(pub)
         formdef = create_formdef()
         formdef.fields = [fields.StringField(id='0', label='string')]
         formdef.enable_tracking_codes = False
         formdef.store()
         formdef.data_class().wipe()
         # anonymous user, no tracking code (-> no draft)
         app = get_app(pub)
         resp = app.get('/test/')
         resp.form['f0'] = 'foobar'
         resp = resp.form.submit('submit')
         resp = resp.form.submit('previous')
         assert [x.status for x in formdef.data_class().select()] == []
         assert 'Cancel' in resp.body
         assert 'Discard' not in resp.body
         resp = resp.form.submit('cancel')
         # anonymous user, tracking code (-> draft)
         formdef.enable_tracking_codes = True
         formdef.store()
         app = get_app(pub)
         resp = app.get('/test/')
         resp.form['f0'] = 'foobar'
         resp = resp.form.submit('submit')
         resp = resp.form.submit('previous')
         assert [x.status for x in formdef.data_class().select()] == ['draft']
         assert 'Cancel' not in resp.body
         assert 'Discard' in resp.body
         resp = resp.form.submit('cancel')
         assert [x.status for x in formdef.data_class().select()] == []  # discarded
         # logged-in user, no tracking code
         formdef.enable_tracking_codes = False
         formdef.store()
         resp = login(get_app(pub), username='foo', password='foo').get('/test/')
         resp.form['f0'] = 'foobar'
         resp = resp.form.submit('submit')
         resp = resp.form.submit('previous')
         assert [x.status for x in formdef.data_class().select()] == ['draft']
         assert 'Cancel' not in resp.body
         assert 'Discard' in resp.body
         resp = resp.form.submit('cancel')
         assert [x.status for x in formdef.data_class().select()] == []  # discarded
         # logged-in user, tracking code
         formdef.enable_tracking_codes = True
         formdef.store()
         resp = login(get_app(pub), username='foo', password='foo').get('/test/')
         resp.form['f0'] = 'foobar'
         resp = resp.form.submit('submit')
         resp = resp.form.submit('previous')
         assert [x.status for x in formdef.data_class().select()] == ['draft']
         assert 'Cancel' not in resp.body
         assert 'Discard' in resp.body
         resp = resp.form.submit('cancel')
         assert [x.status for x in formdef.data_class().select()] == []  # discarded
         # anonymous user, tracking code, recalled
         formdef.enable_tracking_codes = True
         formdef.store()
         app = get_app(pub)
         resp = app.get('/test/')
         resp.form['f0'] = 'foobar'
         resp = resp.form.submit('submit')
         resp = resp.form.submit('previous')
         assert [x.status for x in formdef.data_class().select()] == ['draft']
         assert 'Cancel' not in resp.body
         assert 'Discard' in resp.body
         tracking_code = get_displayed_tracking_code(resp)
         resp = get_app(pub).get('/')
         resp.form['code'] = tracking_code
         resp = resp.form.submit().follow().follow().follow()
         assert resp.forms[1]['f0'].value == 'foobar'
         assert 'Cancel' in resp.body
         assert 'Discard Draft' in resp.body
         resp = resp.forms[1].submit('cancel')
         assert [x.status for x in formdef.data_class().select()] == ['draft']
         # logged-in user, no tracking code, recalled
         formdef.data_class().wipe()
         formdef.enable_tracking_codes = False
         formdef.store()
         resp = login(get_app(pub), username='foo', password='foo').get('/test/')
         resp.form['f0'] = 'foobar'
         resp = resp.form.submit('submit')
         resp = resp.form.submit('previous')
         assert [x.status for x in formdef.data_class().select()] == ['draft']
         resp = login(get_app(pub), username='foo', password='foo').get('/test/')
         resp = resp.click('Continue with draft').follow()
         assert 'Cancel' in resp.body
         assert 'Discard Draft' in resp.body
         resp = resp.forms[1].submit('cancel')
         assert [x.status for x in formdef.data_class().select()] == ['draft']
     def test_form_invalid_tracking_code(pub):
         formdef = create_formdef()
         formdef.fields = [fields.StringField(id='0', label='string')]

             if page:
                 form.add_hidden('page_id', page.id)
             form.add_submit('cancel', _('Cancel'), css_class = 'cancel')
             cancel_label = _('Cancel')
             if self.has_draft_support() and not (data and data.get('is_recalled_draft')):
                 cancel_label = _('Discard')
             form.add_submit('cancel', cancel_label, css_class='cancel')
             if self.has_draft_support():
                 form.add_submit('savedraft', _('Save Draft'), css_class = 'save-draft',
                 form.add_submit('savedraft', _('Save Draft'), css_class='save-draft',
                         attrs={'style': 'display: none'})
             context = {
-...
             if data.get('is_recalled_draft'):
                 r += htmltext('<form action="removedraft" method="POST">')
                 r += htmltext('<input type="hidden" name="magictoken" value="%s">') % magictoken
                 r += htmltext('<button>%s</button>') % _('Remove Draft')
                 r += htmltext('<button>%s</button>') % _('Discard Draft')
                 r += htmltext('</form>')
             text = r.getvalue()
-...
                 get_logger().info('form %s - cancel' % (self.formdef.name))
                 if self.edit_mode:
                     return redirect('.')
                 magictoken = form.get_widget('magictoken').parse()
                 if self.has_draft_support():
                     current_draft = self.get_current_draft()
                     if current_draft:
                         discard_draft = True
                         if magictoken:
                             data = session.get_by_magictoken(magictoken, {})
                             if data.get('is_recalled_draft'):
                                 discard_draft = False
                         if discard_draft:
                             current_draft.remove_self()
                 try:
                     magictoken = form.get_widget('magictoken').parse()
                     cancelurl = session.get_by_magictoken(magictoken, {}).get('__cancelurl')
                     if cancelurl:
                         return redirect(cancelurl)
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-forms-add-an-explicit-discard-button-instead-of-canc.patch