From 3ee21cbc31435430a4942927415401c77d2b8620 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Thu, 30 Aug 2018 12:01:26 +0300 Subject: [PATCH] Move passport page from tab to modal button --- abonapp/locale/ru/LC_MESSAGES/django.po | 3 ++ abonapp/models.py | 2 +- abonapp/templates/abonapp/editAbon.html | 10 ++++ abonapp/templates/abonapp/ext.htm | 7 --- .../abonapp/modal_passport_view.html | 15 ++++++ abonapp/templates/abonapp/passport_view.html | 46 ------------------- abonapp/views.py | 4 +- 7 files changed, 31 insertions(+), 56 deletions(-) create mode 100644 abonapp/templates/abonapp/modal_passport_view.html delete mode 100644 abonapp/templates/abonapp/passport_view.html diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po index 38cb70b..f4e5d44 100644 --- a/abonapp/locale/ru/LC_MESSAGES/django.po +++ b/abonapp/locale/ru/LC_MESSAGES/django.po @@ -1163,3 +1163,6 @@ msgstr "История задач" msgid "Charts" msgstr "Графики" + +msgid "Cancel" +msgstr "Отмена" diff --git a/abonapp/models.py b/abonapp/models.py index 7ea8dfc..c724de0 100644 --- a/abonapp/models.py +++ b/abonapp/models.py @@ -296,7 +296,7 @@ class PassportInfo(models.Model): series = models.CharField(_('Pasport serial'), max_length=4, validators=(validators.integer_validator,)) number = models.CharField(_('Pasport number'), max_length=6, validators=(validators.integer_validator,)) distributor = models.CharField(_('Distributor'), max_length=64) - date_of_acceptance = models.DateField() + date_of_acceptance = models.DateField(_('Date of acceptance')) abon = models.OneToOneField(Abon, on_delete=models.CASCADE, blank=True, null=True) class Meta: diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html index 6767cca..1022e20 100644 --- a/abonapp/templates/abonapp/editAbon.html +++ b/abonapp/templates/abonapp/editAbon.html @@ -97,6 +97,16 @@ {% trans 'Send sms' %} {% endif %} + + {% if perms.abonapp.can_view_passport %} + + {% trans 'Passport information' %} + + {% else %} + + {% trans 'Passport information' %} + + {% endif %} diff --git a/abonapp/templates/abonapp/ext.htm b/abonapp/templates/abonapp/ext.htm index 31ea0de..51ac412 100644 --- a/abonapp/templates/abonapp/ext.htm +++ b/abonapp/templates/abonapp/ext.htm @@ -29,13 +29,6 @@ {% trans 'Services' %} - {% if perms.abonapp.can_view_passport %} - {% url 'abonapp:passport_view' group.pk abon.username as passport_view_url %} - - {% trans 'Passport information' %} - - {% endif %} - {% url 'abonapp:abon_phistory' group.pk abon.username as abphist %} {% trans 'Payments' %} diff --git a/abonapp/templates/abonapp/modal_passport_view.html b/abonapp/templates/abonapp/modal_passport_view.html new file mode 100644 index 0000000..f007ae7 --- /dev/null +++ b/abonapp/templates/abonapp/modal_passport_view.html @@ -0,0 +1,15 @@ +{% load i18n %} +{% load bootstrap3 %} +
{% csrf_token %} +
+ +

{% trans 'Passport information' %}

+
+
+ + {% bootstrap_form form %} + + {% trans 'Save' as tx %} + {% bootstrap_button tx button_type='submit' button_class='btn-primary' icon='floppy-disk' %} +
+
diff --git a/abonapp/templates/abonapp/passport_view.html b/abonapp/templates/abonapp/passport_view.html deleted file mode 100644 index 86c37ee..0000000 --- a/abonapp/templates/abonapp/passport_view.html +++ /dev/null @@ -1,46 +0,0 @@ -{% extends request.is_ajax|yesno:'nullcont.htm,abonapp/ext.htm' %} -{% load i18n %} -{% load bootstrap3 %} -{% block content %} - -
-
-
-
-

{% trans 'Passport information' %}

-
-
-
{% csrf_token %} - - {% bootstrap_field form.series label_class='col-sm-5 col-md-3' field_class='col-sm-7 col-md-9' form_group_class='form-group-sm' %} - {% bootstrap_field form.number label_class='col-sm-5 col-md-3' field_class='col-sm-7 col-md-9' form_group_class='form-group-sm' %} - {% bootstrap_field form.distributor label_class='col-sm-5 col-md-3' field_class='col-sm-7 col-md-9' form_group_class='form-group-sm' %} - -
- -
- {{ form.date_of_acceptance }}{{ form.date_of_acceptance.errors }} -
- -
- -
-
- -
-
- -
-
-
-
-
-{% endblock %} \ No newline at end of file diff --git a/abonapp/views.py b/abonapp/views.py index fbab808..e4fd651 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -517,7 +517,7 @@ class TaskLogListView(ListView): class PassportUpdateView(UpdateView): form_class = forms.PassportForm model = models.PassportInfo - template_name = 'abonapp/passport_view.html' + template_name = 'abonapp/modal_passport_view.html' def get_object(self, queryset=None): self.abon = get_object_or_404(models.Abon, username=self.kwargs.get('uname')) @@ -535,7 +535,7 @@ class PassportUpdateView(UpdateView): return super(PassportUpdateView, self).form_valid(form) def get_success_url(self): - return resolve_url('abonapp:passport_view', + return resolve_url('abonapp:abon_home', gid=self.kwargs.get('gid'), uname=self.kwargs.get('uname'))