Projet

Général

Profil

0001-backoffice-include-formdata-sidebar-in-edit-mode-109.patch

Frédéric Péters, 16 mai 2016 18:36

Télécharger (2,5 ko)

Voir les différences:

Subject: [PATCH] backoffice: include formdata sidebar in edit mode (#10946)

 tests/test_backoffice_pages.py |  6 ++++++
 wcs/backoffice/submission.py   | 12 ++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
tests/test_backoffice_pages.py
1554 1554
    form_class = formdef.data_class()
1555 1555

  
1556 1556
    number31 = [x for x in form_class.select() if x.data['1'] == 'FOO BAR 30'][0]
1557
    number31.submission_context = {
1558
            'mail_url': 'http://www.example.com/test.pdf',
1559
    }
1560
    number31.store()
1557 1561

  
1558 1562
    # attach a custom workflow
1559 1563
    workflow = Workflow(name='wfedit')
......
1575 1579
    assert (' with the number %s.' % number31.get_display_id()) in resp.body
1576 1580
    resp = resp.form.submit('button_wfedit')
1577 1581
    resp = resp.follow()
1582
    assert 'http://www.example.com/test.pdf' in resp.body # make sure sidebar has details
1583
    assert not 'Tracking Code' in resp.body # make sure it doesn't display a tracking code
1578 1584
    assert resp.form['f1'].value == number31.data['1']
1579 1585
    assert resp.form['f2'].value == number31.data['2']
1580 1586
    assert resp.form['f3'].value == number31.data['3']
wcs/backoffice/submission.py
94 94
        r = TemplateIO(html=True)
95 95

  
96 96
        formdata = None
97
        draft_formdata_id = data.get('draft_formdata_id')
98
        if draft_formdata_id:
99
            formdata = self.formdef.data_class().get(draft_formdata_id)
100
        if self.formdef.enable_tracking_codes:
97
        if self.edit_mode:
98
            formdata = self.edited_data
99
        else:
100
            draft_formdata_id = data.get('draft_formdata_id')
101
            if draft_formdata_id:
102
                formdata = self.formdef.data_class().get(draft_formdata_id)
103

  
104
        if self.formdef.enable_tracking_codes and not self.edit_mode:
101 105
            r += htmltext('<h3>%s</h3>') % _('Tracking Code')
102 106
            if formdata and formdata.tracking_code:
103 107
                r += htmltext('<p>%s</p>') % formdata.tracking_code
104
-