Projet

Général

Profil

0001-emails-use-correct-variable-name-for-global-email-pr.patch

Frédéric Péters, 19 mai 2020 10:06

Télécharger (2,51 ko)

Voir les différences: 

Subject: [PATCH] emails: use correct variable name for global email prefix
 (#43064)


 hobo/emails/forms.py | 2 +-
 hobo/emails/views.py | 2 +-
 tests/test_emails.py | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
hobo/emails/forms.py
31 31 
    default_from_email = ValidEmailField(label=_('Default From'))
32 32 
    email_signature = forms.CharField(label=_('Signature'), required=False,
33 33 
            widget=forms.Textarea)
34 
    email_prefix = forms.CharField(label=_('Prefix'), required=False,
34 
    global_email_prefix = forms.CharField(label=_('Prefix'), required=False,
35 35 
            help_text=_('Custom prefix for emails subject (defaults to plateform title)'))
36 36 

  		




  37
  37
  
    
    def __init__(self, *args, **kwargs):

  		












  

    
      hobo/emails/views.py
    
  





  24
  24
  
    

  		




  25
  25
  
    
class HomeView(VariablesFormMixin, TemplateView):

  		




  26
  26
  
    
    template_name = 'hobo/emails_home.html'

  		




  27
  
  
    
    variables = ['default_from_email', 'email_signature', 'email_prefix']

  		




  
  27
  
    
    variables = ['default_from_email', 'email_signature', 'global_email_prefix']

  		




  28
  28
  
    
    form_class = EmailsForm

  		




  29
  29
  
    
    success_message = _('Emails settings have been updated. '

  		




  30
  30
  
    
                        'It will take a few seconds to be effective.')

  		












  

    
      tests/test_emails.py
    
  





  185
  185
  
    
    resp = app.get('/emails/')

  		




  186
  186
  
    
    resp.form['default_from_email'] = 'john.doe@example.com'

  		




  187
  187
  
    
    resp.form['email_signature'] = 'my signature'

  		




  188
  
  
    
    resp.form['email_prefix'] = 'my mail object'

  		




  
  188
  
    
    resp.form['global_email_prefix'] = 'my prefix'

  		




  189
  189
  
    
    resp = resp.form.submit()

  		




  190
  190
  
    
    assert Variable.objects.filter(name='default_from_email')[0].value == 'john.doe@example.com'

  		




  191
  191
  
    
    assert Variable.objects.filter(name='email_signature')[0].value == 'my signature'

  		




  192
  
  
    
    assert Variable.objects.filter(name='email_prefix')[0].value == 'my mail object'

  		




  
  192
  
    
    assert Variable.objects.filter(name='global_email_prefix')[0].value == 'my prefix'

  		




  193
  
  
    
-