Projet

Général

Profil

0001-forms-remove-cancel-button-27420.patch

Frédéric Péters, 19 octobre 2018 16:21

Télécharger (4,62 ko)

Voir les différences:

Subject: [PATCH] forms: remove cancel button (#27420)

 tests/test_backoffice_pages.py | 18 +-----------------
 wcs/forms/root.py              | 20 --------------------
 2 files changed, 1 insertion(+), 37 deletions(-)
tests/test_backoffice_pages.py
1484 1484

  
1485 1485
    assert data_class.count() == formdata_count + 1
1486 1486

  
1487
    # test redirection on cancel
1488
    resp = app.get('/backoffice/submission/')
1489
    assert formdef.url_name in resp.body
1490

  
1491
    resp = resp.click(formdef.name)
1492
    resp.form['f1'] = 'test submission'
1493
    resp = resp.form.submit('cancel')
1494
    assert resp.location == 'http://example.net/backoffice/submission/'
1495

  
1496 1487
def test_backoffice_submission_with_tracking_code(pub):
1497 1488
    user = create_user(pub)
1498 1489
    create_environment(pub)
......
1891 1882
    resp = resp.click('#%s' % formdata_no)
1892 1883
    resp = resp.follow()
1893 1884

  
1894
    # and try to delete the form (but cancel)
1895
    resp = resp.click('Delete this form')
1896
    resp = resp.form.submit('cancel')
1897
    assert resp.location == 'http://example.net/backoffice/submission/'
1898
    assert data_class.count() == 1
1899
    assert pub.tracking_code_class().count() == 1
1900

  
1901
    # and this time for real
1885
    # delete draft
1902 1886
    resp = app.get('/backoffice/submission/')
1903 1887
    resp = resp.click('#%s' % formdata_no)
1904 1888
    resp = resp.follow()
wcs/forms/root.py
405 405
        if page:
406 406
            form.add_hidden('page_id', page.id)
407 407

  
408
        form.add_submit('cancel', _('Cancel'), css_class = 'cancel')
409 408
        if self.has_draft_support():
410 409
            form.add_submit('savedraft', _('Save Draft'), css_class = 'save-draft',
411 410
                    attrs={'style': 'display: none'})
......
629 628
        form.add_hidden('step', '-1')
630 629
        form.add_hidden('page', '-1')
631 630
        form.add_hidden('magictoken', '-1')
632
        form.add_submit('cancel')
633 631

  
634 632
        if self.has_draft_support():
635 633
            form.add_submit('removedraft')
......
670 668
                raise errors.TraversalError()
671 669
            return self.page(self.pages[0])
672 670

  
673
        if form.get_submit() == 'cancel':
674
            get_logger().info('form %s - cancel' % (self.formdef.name))
675
            if self.edit_mode:
676
                return redirect('.')
677
            try:
678
                magictoken = form.get_widget('magictoken').parse()
679
                cancelurl = session.get_by_magictoken(magictoken, {}).get('__cancelurl')
680
                if cancelurl:
681
                    return redirect(cancelurl)
682
            except KeyError:
683
                pass
684
            if get_request().is_in_backoffice():
685
                return redirect(get_publisher().get_backoffice_url() + '/submission/')
686
            return redirect(get_publisher().get_root_url())
687

  
688 671
        try:
689 672
            step = int(form.get_widget('step').parse())
690 673
        except TypeError:
......
836 819
                    form.add_hidden('step', '-1')
837 820
                    form.add_hidden('page', '-1')
838 821
                    form.add_hidden('magictoken', '-1')
839
                    form.add_submit('cancel')
840 822
                    if self.has_draft_support():
841 823
                        form.add_submit('removedraft')
842 824
                        form.add_submit('savedraft')
......
861 843
            form.add_hidden('step', '-1')
862 844
            form.add_hidden('page', '-1')
863 845
            form.add_hidden('magictoken', '-1')
864
            form.add_submit('cancel')
865 846

  
866 847
        if step == 2:
867 848
            form.add_submit('previous')
......
1190 1171
            form.captcha.has_error = lambda request: False
1191 1172
        form.add_submit('submit', _('Submit'))
1192 1173
        form.add_submit('previous', _('Previous'))
1193
        form.add_submit('cancel', _('Cancel'), css_class = 'cancel')
1194 1174
        session = get_session()
1195 1175
        if self.has_draft_support():
1196 1176
            form.add_submit('savedraft', _('Save Draft'), css_class = 'save-draft',
1197
-