From aa79e8cb2c3430aa17e77de23e937b49e9ca826f Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Thu, 2 May 2019 23:35:10 +0300 Subject: [PATCH] fix telephone regexp --- abonapp/models.py | 2 +- accounts_app/models.py | 2 +- djing/local_settings.py.example | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abonapp/models.py b/abonapp/models.py index d2c6ebc..2a4be2b 100644 --- a/abonapp/models.py +++ b/abonapp/models.py @@ -471,7 +471,7 @@ class AdditionalTelephone(models.Model): verbose_name=_('Telephone'), # unique=True, validators=(RegexValidator( - getattr(settings, 'TELEPHONE_REGEXP', r'^(\+[7,8,9,3]\d{10,11})?$') + getattr(settings, 'TELEPHONE_REGEXP', r'^(\+[7893]\d{10,11})?$') ),) ) owner_name = models.CharField(max_length=127) diff --git a/accounts_app/models.py b/accounts_app/models.py index 825bd1a..cd8f2d0 100644 --- a/accounts_app/models.py +++ b/accounts_app/models.py @@ -62,7 +62,7 @@ class BaseAccount(AbstractBaseUser, PermissionsMixin): verbose_name=_('Telephone'), blank=True, validators=(RegexValidator( - getattr(settings, 'TELEPHONE_REGEXP', r'^(\+[7,8,9,3]\d{10,11})?$') + getattr(settings, 'TELEPHONE_REGEXP', r'^(\+[7893]\d{10,11})?$') ),) ) diff --git a/djing/local_settings.py.example b/djing/local_settings.py.example index d83df1b..1bf13a2 100644 --- a/djing/local_settings.py.example +++ b/djing/local_settings.py.example @@ -39,7 +39,7 @@ DEFAULT_SNMP_PASSWORD = 'public' TELEGRAM_BOT_TOKEN = 'bot token' # Telephone or empty -TELEPHONE_REGEXP = r'^(\+[7,8,9,3]\d{10,11})?$' +TELEPHONE_REGEXP = r'^(\+[7893]\d{10,11})?$' ASTERISK_MANAGER_AUTH = { 'username': 'admin',