Projet

Général

Profil

0001-misc-fix-submitter-email-lookup-in-case-of-unfilled-.patch

Frédéric Péters, 19 avril 2021 15:00

Télécharger (1,75 ko)

Voir les différences: 

Subject: [PATCH] misc: fix submitter email lookup in case of unfilled block
 data (#53254)


 tests/test_formdata.py | 4 ++++
 wcs/formdef.py         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
tests/test_formdata.py
228 228 
    formdef.fields = [
229 229 
        fields.StringField(id='0', label='email', varname='foo', prefill={'type': 'user', 'value': 'email'}),
230 230 
        fields.BlockField(id='1', label='test', type='block:foobar', max_items=3, varname='block'),
231 
        fields.StringField(id='2', label='other'),
231 232 
    ]
232 233 
    formdef.store()
233 234 

  		




  ......




  263
  264
  
    
    formdata.data = {'1': {}}

  		




  264
  265
  
    
    assert formdef.get_submitter_email(formdata) is None

  		




  265
  266
  
    

  		




  
  267
  
    
    formdata.data = {'2': 'other'}

  		




  
  268
  
    
    assert formdef.get_submitter_email(formdata) is None

  		




  
  269
  
    

  		




  266
  270
  
    
    formdata.data = {

  		




  267
  271
  
    
        '0': 'foo@localhost',

  		




  268
  272
  
    
        '1': {

  		












  

    
      wcs/formdef.py
    
  





  1352
  1352
  
    
                    if not is_user_field(subfield):

  		




  1353
  1353
  
    
                        continue

  		




  1354
  1354
  
    
                    v = formdata.data.get(field.id)

  		




  1355
  
  
    
                    if not v.get('data'):

  		




  
  1355
  
    
                    if not (v and v.get('data')):

  		




  1356
  1356
  
    
                        continue

  		




  1357
  1357
  
    
                    for data in v.get('data'):

  		




  1358
  1358
  
    
                        w = data.get(subfield.id)

  		




  1359
  
  
    
-