Projet

Général

Profil

0001-forms-fix-edition-of-current-formdata-2789.patch

Frédéric Péters, 23 avril 2013 01:39

Télécharger (2,3 ko)

Voir les différences:

Subject: [PATCH] forms: fix edition of current formdata (#2789)

 wcs/forms/root.ptl |   25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)
wcs/forms/root.ptl
402 402
                form.submit_widgets.remove(form._names['prefill'])
403 403
                del form._names['prefill']
404 404

  
405
        if not editing:
406
            if page_no == 0 and not get_request().form.has_key('magictoken'):
407
                magictoken = randbytes(8)
408
            else:
409
                magictoken = get_request().form['magictoken']
410
            form.add_hidden('magictoken', magictoken)
405
        if page_no == 0 and not get_request().form.has_key('magictoken'):
406
            magictoken = randbytes(8)
407
        else:
408
            magictoken = get_request().form['magictoken']
409
        form.add_hidden('magictoken', magictoken)
410
        data = session.get_by_magictoken(magictoken, {})
411 411

  
412
            form.add_submit('submit', _('Next'))
413
            data = session.get_by_magictoken(magictoken, {})
412
        if editing and page_no == self.page_number - 1:
413
            form.add_submit('submit', _('Save Changes'))
414 414
        else:
415
            if page_no == self.page_number - 1:
416
                form.add_submit('submit', _('Save Changes'))
417
            else:
418
                form.add_submit('submit', _('Next'))
419
            data = editing.data
415
            form.add_submit('submit', _('Next'))
420 416

  
421 417
        if page_no > 0:
422 418
            form.add_submit('previous', _('Previous'))
......
499 495
        if editing:
500 496
            existing_formdata = editing.data
501 497
            if not get_request().form:
498
                # on the initial visit editing the form (i.e. not after
499
                # clicking for previous or next page), we need to load the
500
                # existing data into the session
502 501
                token = randbytes(8)
503 502
                get_request().form['magictoken'] = token
504 503
                session.add_magictoken(token, editing.data)
505
-