diff --git a/abonapp/forms.py b/abonapp/forms.py index bc3d14d..38b4c4d 100644 --- a/abonapp/forms.py +++ b/abonapp/forms.py @@ -8,7 +8,7 @@ from . import models from django.conf import settings from djing import IP_ADDR_REGEX -TELEPHONE_REGEXP = getattr(settings, 'TELEPHONE_REGEXP', r'^\+[7,8,9,3]\d{10,11}$') +TELEPHONE_REGEXP = getattr(settings, 'TELEPHONE_REGEXP', r'^(\+[7,8,9,3]\d{10,11})?$') def generate_random_chars(length=6, chars=digits, split=2, delimiter=''): @@ -73,9 +73,7 @@ class AbonForm(forms.ModelForm): }), 'telephone': forms.TextInput(attrs={ 'placeholder': _('telephone placeholder'), - 'pattern': TELEPHONE_REGEXP, - 'required': '', - 'class': 'form-control' + 'pattern': TELEPHONE_REGEXP }), 'description': forms.Textarea(attrs={'rows': '4'}), 'is_active': forms.NullBooleanSelect(attrs={'class': 'form-control'}) diff --git a/abonapp/models.py b/abonapp/models.py index dc036aa..6774eb8 100644 --- a/abonapp/models.py +++ b/abonapp/models.py @@ -19,7 +19,7 @@ from djing import IP_ADDR_REGEX from tariff_app.models import Tariff, PeriodicPay from bitfield import BitField -TELEPHONE_REGEXP = getattr(settings, 'TELEPHONE_REGEXP', r'^\+[7,8,9,3]\d{10,11}$') +TELEPHONE_REGEXP = getattr(settings, 'TELEPHONE_REGEXP', r'^(\+[7,8,9,3]\d{10,11})?$') class AbonLog(models.Model): diff --git a/abonapp/templates/abonapp/addAbon.html b/abonapp/templates/abonapp/addAbon.html index f2f77b1..2c8c1a7 100644 --- a/abonapp/templates/abonapp/addAbon.html +++ b/abonapp/templates/abonapp/addAbon.html @@ -39,19 +39,20 @@ {% bootstrap_icon 'home' as ic %} {% bootstrap_field form.house addon_before=ic %} -
- + {# password field #} + {% bootstrap_icon 'lock' as ic %} + {% bootstrap_button '' button_type='button' icon='eye-open' button_class='btn-default' id='passwdtoggler' size='sm' as bt %} + {% bootstrap_field form.password form_group_class='form-group-sm' addon_after_class='input-group-btn' addon_after=bt addon_before=ic %} -
- - {{ form.password }}{{ form.password.errors }} - - - -
-
+