Projet

Général

Profil

0003-backoffice-include-formdata-channel-name-in-submissi.patch

Frédéric Péters, 08 novembre 2015 12:34

Télécharger (2,47 ko)

Voir les différences: 

Subject: [PATCH 3/3] backoffice: include formdata channel name in submission
 screen (#8913)


 tests/test_backoffice_pages.py | 11 +++++++++--
 wcs/backoffice/submission.py   |  9 ++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)
tests/test_backoffice_pages.py
722 722 
    assert 'Check values then click submit.' in resp.body
723 723 

  		




  724
  724
  
    
    assert data_class.count() == 1

  		




  725
  
  
    
    formdata_no = data_class.select()[0].id

  		




  
  725
  
    
    formdata = data_class.select()[0]

  		




  
  726
  
    
    formdata_no = formdata.id

  		




  726
  727
  
    
    tracking_code = data_class.select()[0].tracking_code

  		




  727
  728
  
    

  		




  728
  729
  
    
    # stop here, go back to index

  		




  729
  730
  
    
    resp = app.get('/backoffice/submission/')

  		




  730
  731
  
    
    assert '%s/%s' % (formdef.url_name, formdata_no) in resp.body

  		




  731
  
  
    
    resp = resp.click('Draft')

  		




  
  732
  
    
    assert '>#%s' % formdata_no in resp.body

  		




  
  733
  
    
    formdata.submission_context = {'channel': 'mail'}

  		




  
  734
  
    
    formdata.store()

  		




  
  735
  
    
    resp = app.get('/backoffice/submission/')

  		




  
  736
  
    
    assert '>Mail #%s' % formdata_no in resp.body

  		




  
  737
  
    

  		




  
  738
  
    
    resp = resp.click('#%s' % formdata_no)

  		




  732
  739
  
    
    resp = resp.follow()

  		




  733
  740
  
    
    assert tracking_code in resp.body

  		




  734
  741
  
    
    resp = resp.form.submit('previous')

  		












  

    
      wcs/backoffice/submission.py
    
  





  201
  201
  
    
                continue

  		




  202
  202
  
    
            for formdata in formdatas:

  		




  203
  203
  
    
                r += htmltext('<li class="smallitem">')

  		




  204
  
  
    
                label = _('Draft #%s, %s') % (formdata.id,

  		




  
  204
  
    
                label = ''

  		




  
  205
  
    
                if formdata.submission_context and formdata.submission_context.get('channel'):

  		




  
  206
  
    
                    label = {

  		




  
  207
  
    
                            'mail': _('Mail'),

  		




  
  208
  
    
                        }.get(formdata.submission_context['channel']) or ''

  		




  
  209
  
    
                    if label:

  		




  
  210
  
    
                        label += ' '

  		




  
  211
  
    
                label += _('#%s, %s') % (formdata.id,

  		




  205
  212
  
    
                        misc.localstrftime(formdata.receipt_time))

  		




  206
  213
  
    
                r += htmltext('<a href="%s/%s">%s</a>') % (

  		




  207
  214
  
    
                        formdef.url_name, formdata.id, label)

  		




  208
  
  
    
-