From 932a2a636e5fe58a2cf3f3de9432d07cddd514ad Mon Sep 17 00:00:00 2001
From: Dmitry <nerosketch@gmail.com>
Date: Sun, 22 Apr 2018 21:51:43 +0000
Subject: [PATCH] place telephone regep from global settings

---
 accounts_app/templates/accounts/create_acc.html       | 3 ++-
 accounts_app/templates/accounts/settings/ch_info.html | 3 ++-
 djing/settings.py                                     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/accounts_app/templates/accounts/create_acc.html b/accounts_app/templates/accounts/create_acc.html
index b9987b4..34d396f 100644
--- a/accounts_app/templates/accounts/create_acc.html
+++ b/accounts_app/templates/accounts/create_acc.html
@@ -1,4 +1,5 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
+{% load globaltags %}
 {% load i18n %}
 {% block main %}
 
@@ -62,7 +63,7 @@
 
                             <div class="input-group">
                                 <span class="input-group-addon"><span class="glyphicon glyphicon-phone"></span></span>
-                                <input id="tel" type="tel" pattern="\+[7,8,9,3]\d{10,11}" name="telephone"
+                                <input id="tel" type="tel" pattern="{% global_var 'TELEPHONE_REGEXP' %}" name="telephone"
                                        placeholder="{% trans '+[7,8,9,3] and 10,11 digits' %}" value="{{ newuser.telephone }}"
                                        class="form-control" required>
                             </div>
diff --git a/accounts_app/templates/accounts/settings/ch_info.html b/accounts_app/templates/accounts/settings/ch_info.html
index df563c0..8d38752 100644
--- a/accounts_app/templates/accounts/settings/ch_info.html
+++ b/accounts_app/templates/accounts/settings/ch_info.html
@@ -1,4 +1,5 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,accounts/settings/ext.htm' %}
+{% load globaltags %}
 {% load i18n %}
 {% block content %}
 
@@ -38,7 +39,7 @@
 
             <div class="input-group">
                 <span class="input-group-addon"><span class="glyphicon glyphicon-user"></span></span>
-                <input id="tel" type="text" value="{{ user.telephone }}" pattern="\+[7,8,9,3]\d{10,11}" name="telephone"
+                <input id="tel" type="text" value="{{ user.telephone }}" pattern="{% global_var 'TELEPHONE_REGEXP' %}" name="telephone"
                        placeholder="{% trans '+[7,8,9,3] and 10,11 digits' %}" class="form-control">
             </div>
         </div>
diff --git a/djing/settings.py b/djing/settings.py
index 65f3a67..bb38d4e 100644
--- a/djing/settings.py
+++ b/djing/settings.py
@@ -172,7 +172,7 @@ DEFAULT_SNMP_PASSWORD = local_settings.DEFAULT_SNMP_PASSWORD
 
 TELEGRAM_BOT_TOKEN = local_settings.TELEGRAM_BOT_TOKEN
 
-TELEPHONE_REGEXP = r'^\+[7,8,9,3]\d{10,11}$'
+TELEPHONE_REGEXP = local_settings.TELEPHONE_REGEXP
 
 ASTERISK_MANAGER_AUTH = local_settings.ASTERISK_MANAGER_AUTH