Projet

Général

Profil

0001-sms-remove-empty-sms-addresses-submited-by-admin-pag.patch

Nicolas Roche, 26 août 2019 17:43

Télécharger (2,42 ko)

Voir les différences: 

Subject: [PATCH] sms: remove empty sms addresses submited by admin page form
 (#31823)


 tests/test_admin_pages.py | 11 ++++++++++-
 wcs/workflows.py          |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)
tests/test_admin_pages.py
1131 1131 
    resp = resp.forms[0].submit()
1132 1132 
    resp = resp.follow()
1133 1133 
    assert len(FormDef.get(1).fields) == 0
1134
1134 

  		




  1135
  1135
  
    
def test_form_duplicate_field(pub):

  		




  1136
  1136
  
    
    user = create_superuser(pub)

  		




  1137
  1137
  
    
    create_role()

  		




  ......




  2622
  2622
  
    

  		




  2623
  2623
  
    
    resp = resp.click('SMS')

  		




  2624
  2624
  
    
    resp = resp.form.submit()

  		




  
  2625
  
    
    assert 'to$element0$value_text' in resp.form.fields.keys()

  		




  
  2626
  
    
    assert 'to$element1$value_text' not in resp.form.fields.keys()

  		




  
  2627
  
    

  		




  
  2628
  
    
    resp = resp.form.submit('submit')

  		




  
  2629
  
    
    resp = resp.follow()

  		




  
  2630
  
    
    resp = resp.follow()

  		




  
  2631
  
    
    resp = resp.click(href='items/1/', index=0)

  		




  
  2632
  
    
    assert 'to$element0$value_text' in resp.form.fields.keys()

  		




  
  2633
  
    
    assert 'to$element1$value_text' not in resp.form.fields.keys()

  		




  2625
  2634
  
    

  		




  2626
  2635
  
    
def test_workflows_edit_display_form_action(pub):

  		




  2627
  2636
  
    
    create_superuser(pub)

  		












  

    
      wcs/workflows.py
    
  





  832
  832
  
    
                continue

  		




  833
  833
  
    
            if list(el):

  		




  834
  834
  
    
                if type(getattr(self, attribute)) is list:

  		




  835
  
  
    
                    v = [x.text.encode(charset) for x in el]

  		




  
  835
  
    
                    v = [x.text.encode(charset) for x in el if x]

  		




  836
  836
  
    
                elif type(getattr(self, attribute)) is dict:

  		




  837
  837
  
    
                    v = {}

  		




  838
  838
  
    
                    for e in el:

  		




  ......




  2619
  2619
  
    
        super(SendSMSWorkflowStatusItem, self).add_parameters_widgets(

  		




  2620
  2620
  
    
                form, parameters, prefix=prefix, formdef=formdef)

  		




  2621
  2621
  
    
        if 'to' in parameters:

  		




  
  2622
  
    
            self.to = [x for x in self.to if x]

  		




  2622
  2623
  
    
            form.add(WidgetList, '%sto' % prefix, title=_('To'),

  		




  2623
  2624
  
    
                     element_type=ComputedExpressionWidget,

  		




  2624
  2625
  
    
                     value=self.to, add_element_label=_('Add Number'),

  		




  2625
  
  
    
-