0001-emails-allow-configuring-known-valid-domains-for-typ.patch

Frédéric Péters, 03 juillet 2020 08:05

Voir les différences: en ligne côte à côte

Subject: [PATCH] emails: allow configuring known/valid domains for typo fixes
 (#44663)

 tests/test_admin_pages.py            |  6 ++++++
 tests/test_widgets.py                |  5 ++++-
 wcs/qommon/admin/emails.py           | 13 ++++++++++++-
 wcs/qommon/form.py                   |  7 ++++++-
 wcs/qommon/publisher.py              | 16 ++++++++++++++++
 wcs/qommon/static/js/qommon.forms.js |  6 ++----
 6 files changed, 46 insertions(+), 7 deletions(-)

         resp = app.get('/backoffice/settings/emails/')
         resp = resp.click('General Options')
         assert 'Warning: all emails are sent to &lt;foo@example.net&gt;' in resp.text
         resp.form['from'] = 'test@localhost'
         resp = resp.form.submit('submit')
         pub.reload_cfg()
         assert pub.cfg['emails']['from'] == 'test@localhost'
         assert pub.cfg['emails']['well_known_domains']
         assert pub.cfg['emails']['valid_known_domains']
         pub.cfg['debug'] = {}
         pub.write_cfg()

     import shutil
     import copy
     from quixote import cleanup
     from quixote import cleanup, get_response
     from quixote.http_request import parse_query
     import mechanize
-...
     def test_emailwidget():
         pub.cfg = {'emails': {'check_domain_with_dns': True}}
         get_response().javascript_code_parts = []
         widget = EmailWidget('test')
         form = MockHtmlForm(widget)
         assert 'name="test"' in form.as_html
         assert 'WCS_WELL_KNOWN_DOMAINS' in ''.join(get_response().javascript_code_parts)
         req.form = {}
         assert widget.parse() is None

                     title = _('Check DNS for domain name'),
                     value = emails.get('check_domain_with_dns', True),
                     hint = _('Use a DNS request to check domain names used in email fields'))
             form.add(WidgetList, 'well_known_domains',
                     title=_('Domains to check for spelling errors'),
                     element_type=StringWidget,
                     element_kwargs={'render_br': False},
                     value=get_publisher().get_email_well_known_domains())
             form.add(WidgetList, 'valid_known_domains',
                     title=_('Domains that should not be considered spelling errors'),
                     element_type=StringWidget,
                     element_kwargs={'render_br': False},
                     value=get_publisher().get_email_valid_known_domains())
             form.add_submit('submit', _('Submit'))
             form.add_submit('cancel', _('Cancel'))
-...
             else:
                 cfg_submit(form, 'emails', [ 'smtp_server', 'smtp_login',
                     'smtp_password', 'from', 'reply_to', 'footer',
                     'check_domain_with_dns'])
                     'check_domain_with_dns', 'well_known_domains',
                     'valid_known_domains'])
                 return redirect('.')
         def _q_index(self):

         def add_media(self):
             get_response().add_javascript(['jquery.js', '../../i18n.js', 'qommon.forms.js'])
             get_response().add_javascript_code('''
                 const WCS_WELL_KNOWN_DOMAINS = %s;
                 const WCS_VALID_KNOWN_DOMAINS = %s;
             ''' % (json.dumps(get_publisher().get_email_well_known_domains()),
                    json.dumps(get_publisher().get_email_valid_known_domains())))
         def _parse(self, request):
             StringWidget._parse(self, request)
-...
                         return
                     domain = force_text(domain, 'utf-8', errors='ignore')
                     try:
                         domain = domain.encode('idna')
                         domain = force_str(domain.encode('idna'))
                     except UnicodeError:
                         self.error = _('invalid address domain')
                         return

                 return [x.strip() for x in modes.split(',')]
             return ['lazy', 'django-condition']
         def get_email_well_known_domains(self):
             emails_cfg = get_cfg('emails', {})
             well_known_domains = emails_cfg.get('well_known_domains')
             if not well_known_domains:
                 well_known_domains = ['gmail.com', 'msn.com', 'hotmail.com',
                         'hotmail.fr', 'wanadoo.fr', 'free.fr', 'yahoo.fr',
                         'numericable.fr', 'laposte.fr', 'orange.fr', 'yahoo.com']
             return well_known_domains
         def get_email_valid_known_domains(self):
             emails_cfg = get_cfg('emails', {})
             valid_known_domains = emails_cfg.get('valid_known_domains')
             if not valid_known_domains:
                 valid_known_domains = ['yopmail.com']
             return valid_known_domains
         def get_substitution_variables(self):
             from . import misc
             from wcs.variables import LazyDateObject

         });
+      }
       // common domains we want to offer suggestions for.
       var well_known_domains = ['gmail.com', 'msn.com', 'hotmail.com', 'hotmail.fr', 'wanadoo.fr',
                                 'free.fr', 'yahoo.fr', 'numericable.fr', 'laposte.fr', 'orange.fr',
                                 'yahoo.com'];
       var well_known_domains = WCS_WELL_KNOWN_DOMAINS;
       // existing domains we know but don't want to use in suggestion engine.
       var known_domains = ['yopmail.com'];
       var known_domains = WCS_VALID_KNOWN_DOMAINS;
       $('input[type=email]').on('change wcs:change', function() {
         var $email_input = $(this);
         var val = $email_input.val();
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-emails-allow-configuring-known-valid-domains-for-typ.patch