Projet

Général

Profil

0001-preview-remind-it-was-a-preview-on-last-submit-page-.patch

Frédéric Péters, 06 mars 2019 09:32

Télécharger (2,22 ko)

Voir les différences:

Subject: [PATCH] preview: remind it was a preview on last submit page (#29949)

 tests/test_form_pages.py |  4 ++--
 wcs/forms/preview.py     | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)
tests/test_form_pages.py
2039 2039
    next_page = page.forms[0].submit('submit')
2040 2040
    assert 'Check values then click submit.' in next_page.body
2041 2041
    next_page = next_page.forms[0].submit('submit')
2042
    assert next_page.status_int == 302
2043
    assert next_page.location == 'http://example.net/preview/test/'
2042
    assert next_page.status_int == 200
2043
    assert 'This was only a preview: form was not actually submitted.' in next_page.body
2044 2044
    assert len([x for x in formdef.data_class().select() if not x.is_draft()]) == 0
2045 2045

  
2046 2046
def test_form_item_data_source_field_submit(pub):
wcs/forms/preview.py
14 14
# You should have received a copy of the GNU General Public License
15 15
# along with this program; if not, see <http://www.gnu.org/licenses/>.
16 16

  
17
from quixote import get_publisher, redirect
17
from quixote import get_publisher
18 18
from quixote.directory import Directory, AccessControlled
19
from qommon import errors
19
from quixote.html import htmltext, TemplateIO
20
from qommon import errors, _
20 21

  
21 22
from .root import FormPage
22 23

  
......
31 32
        return False
32 33

  
33 34
    def submitted(self, *args, **kwargs):
34
        return redirect('.')
35
        self.html_top(self.formdef.name)
36
        r = TemplateIO(html=True)
37
        r += htmltext('<div class="warningnotice"><p>')
38
        r += _('This was only a preview: form was not actually submitted.')
39
        r += htmltext(' <a href=".">%s</a>') % _('Start another preview.')
40
        r += htmltext('</p></div>')
41
        return r.getvalue()
35 42

  
36 43

  
37 44
class PreviewDirectory(AccessControlled, Directory):
38
-