From b9d0f66250d9135cc1a3b2c3b0ae3c0f3c379862 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Mon, 24 Dec 2018 15:30:23 +0300 Subject: [PATCH] add check for existing duplicates tasks. And remote target=blank --- abonapp/templates/abonapp/debtors.html | 14 ++++++++++---- abonapp/templates/abonapp/editAbon.html | 2 +- abonapp/templates/abonapp/group_list.html | 2 +- .../templates/abonapp/invoiceForPayment.html | 2 +- abonapp/templates/abonapp/modal_phonebook.html | 2 +- abonapp/templates/abonapp/payHistory.html | 2 +- abonapp/templates/abonapp/service.html | 2 +- accounts_app/templates/accounts/ext.htm | 2 +- .../templates/devapp/custom_dev_page/onu.html | 5 ++--- .../devapp/custom_dev_page/onu_for_zte.html | 7 ++----- devapp/templates/devapp/group_list.html | 2 +- dialing_app/templates/index.html | 2 +- dialing_app/templatetags/telephone_filters.py | 2 +- msg_app/templates/msg_app/chat.html | 4 ++-- searchapp/templates/searchapp/index.html | 4 ++-- taskapp/locale/ru/LC_MESSAGES/django.po | 3 +++ taskapp/templates/taskapp/details.html | 8 ++++---- taskapp/views.py | 18 ++++++++++++++++++ 18 files changed, 53 insertions(+), 30 deletions(-) diff --git a/abonapp/templates/abonapp/debtors.html b/abonapp/templates/abonapp/debtors.html index 01d1a2b..dda83d5 100644 --- a/abonapp/templates/abonapp/debtors.html +++ b/abonapp/templates/abonapp/debtors.html @@ -31,13 +31,19 @@ {% for invoice in invoices %} {{ invoice.id }} - {{ invoice.abon.username }} + + + {{ invoice.abon.username }} + + {{ invoice.amount }} {{ invoice.comment }} {{ invoice.date_create|date:'d b H:i' }} - {{ invoice.author.username }} + + + {{ invoice.author.username }} + + {% empty %} diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html index f7116ed..84432d4 100644 --- a/abonapp/templates/abonapp/editAbon.html +++ b/abonapp/templates/abonapp/editAbon.html @@ -136,7 +136,7 @@
{% if device %} - + {{ device.comment|truncatechars:11 }} {{ device.ip_address|default:'' }} diff --git a/abonapp/templates/abonapp/group_list.html b/abonapp/templates/abonapp/group_list.html index 0347216..b3d671d 100644 --- a/abonapp/templates/abonapp/group_list.html +++ b/abonapp/templates/abonapp/group_list.html @@ -70,7 +70,7 @@ {% endif %} - + diff --git a/abonapp/templates/abonapp/invoiceForPayment.html b/abonapp/templates/abonapp/invoiceForPayment.html index 594339e..9eef43d 100644 --- a/abonapp/templates/abonapp/invoiceForPayment.html +++ b/abonapp/templates/abonapp/invoiceForPayment.html @@ -49,7 +49,7 @@ {% endif %} - {{ inv.author.username }} + {{ inv.author.username }} {% empty %} diff --git a/abonapp/templates/abonapp/modal_phonebook.html b/abonapp/templates/abonapp/modal_phonebook.html index 99b4d50..822597c 100644 --- a/abonapp/templates/abonapp/modal_phonebook.html +++ b/abonapp/templates/abonapp/modal_phonebook.html @@ -26,7 +26,7 @@
- + {% trans 'Export to csv' %}
diff --git a/abonapp/templates/abonapp/payHistory.html b/abonapp/templates/abonapp/payHistory.html index 93e74f9..ac0bc69 100644 --- a/abonapp/templates/abonapp/payHistory.html +++ b/abonapp/templates/abonapp/payHistory.html @@ -18,7 +18,7 @@ {{ ph.date|date:'d F Y, H:i:s' }} {% if ph.author %} - {{ ph.author.username }} + {{ ph.author.username }} {% else %} {% trans 'System' %} {% endif %} diff --git a/abonapp/templates/abonapp/service.html b/abonapp/templates/abonapp/service.html index dd1326c..d04019e 100644 --- a/abonapp/templates/abonapp/service.html +++ b/abonapp/templates/abonapp/service.html @@ -117,7 +117,7 @@
{% trans 'Auto continue service.' %}
- ? + ?
diff --git a/accounts_app/templates/accounts/ext.htm b/accounts_app/templates/accounts/ext.htm index cdaaf6b..66d9f0e 100644 --- a/accounts_app/templates/accounts/ext.htm +++ b/accounts_app/templates/accounts/ext.htm @@ -17,7 +17,7 @@
- + ava
diff --git a/devapp/templates/devapp/custom_dev_page/onu.html b/devapp/templates/devapp/custom_dev_page/onu.html index ae164fe..fd6258a 100644 --- a/devapp/templates/devapp/custom_dev_page/onu.html +++ b/devapp/templates/devapp/custom_dev_page/onu.html @@ -21,8 +21,7 @@ {% for da in dev_accs %}
  • {% trans 'Attached user' %}: {% if da.group %} - {{ da.get_full_name }} + {{ da.get_full_name }} {% else %} {{ da.get_full_name }} {% endif %} @@ -32,7 +31,7 @@
  • {% with pdev=dev.parent_dev pdgrp=dev.parent_dev.group %} {% trans 'Parent device' %}: - + {{ pdev.ip_address|default:'-' }} {{ pdev.comment }} {% endwith %} diff --git a/devapp/templates/devapp/custom_dev_page/onu_for_zte.html b/devapp/templates/devapp/custom_dev_page/onu_for_zte.html index f7a0d0f..50cf3ee 100644 --- a/devapp/templates/devapp/custom_dev_page/onu_for_zte.html +++ b/devapp/templates/devapp/custom_dev_page/onu_for_zte.html @@ -22,8 +22,7 @@ {% for da in dev_accs %}
  • {% trans 'Attached user' %}: {% if da.group %} - {{ da.get_full_name }} + {{ da.get_full_name }} {% else %} {{ da.get_full_name }} {% endif %} @@ -33,9 +32,7 @@
  • {% with pdev=dev.parent_dev pdgrp=dev.parent_dev.group %} {% trans 'Parent device' %}: - + {{ pdev.ip_address|default:'-' }} {{ pdev.comment }} {% endwith %} diff --git a/devapp/templates/devapp/group_list.html b/devapp/templates/devapp/group_list.html index e124712..a3f2c9d 100644 --- a/devapp/templates/devapp/group_list.html +++ b/devapp/templates/devapp/group_list.html @@ -35,7 +35,7 @@ {% trans 'Devices without group' %} - + {% trans 'Export to nagios objects' %} diff --git a/dialing_app/templates/index.html b/dialing_app/templates/index.html index 1a12cb7..1bccf3a 100644 --- a/dialing_app/templates/index.html +++ b/dialing_app/templates/index.html @@ -60,7 +60,7 @@ - + diff --git a/dialing_app/templatetags/telephone_filters.py b/dialing_app/templatetags/telephone_filters.py index 29cf37c..64a6fa6 100644 --- a/dialing_app/templatetags/telephone_filters.py +++ b/dialing_app/templatetags/telephone_filters.py @@ -14,7 +14,7 @@ def abon_if_telephone(value): if value[0] != '+': value = '+' + value url = resolve_url('dialapp:to_abon', tel=value) - a = '%s' % (url, value) + a = '%s' % (url, value) return a else: return value diff --git a/msg_app/templates/msg_app/chat.html b/msg_app/templates/msg_app/chat.html index 48a4488..6434a15 100644 --- a/msg_app/templates/msg_app/chat.html +++ b/msg_app/templates/msg_app/chat.html @@ -37,7 +37,7 @@
    {% if can_view_profile %} - + ava {% else %} @@ -51,7 +51,7 @@ 
    {{ msg.text }}
    {% if msg.attachment %} - + {{ msg.attachment }} {% endif %} diff --git a/searchapp/templates/searchapp/index.html b/searchapp/templates/searchapp/index.html index 94b4b96..999debf 100644 --- a/searchapp/templates/searchapp/index.html +++ b/searchapp/templates/searchapp/index.html @@ -38,7 +38,7 @@
    {% for ab in abons %} - +

    {{ ab.username_display|safe }} @@ -70,7 +70,7 @@ {% else %} {% url 'devapp:fix_device_group' dev.pk as devviewlink %} {% endif %} - +

    {{ dev.comment|safe }} diff --git a/taskapp/locale/ru/LC_MESSAGES/django.po b/taskapp/locale/ru/LC_MESSAGES/django.po index 2e9b19b..af02fc2 100644 --- a/taskapp/locale/ru/LC_MESSAGES/django.po +++ b/taskapp/locale/ru/LC_MESSAGES/django.po @@ -508,3 +508,6 @@ msgstr "Напоминание о задаче отправлено" msgid "View all new tasks" msgstr "Все незавершённые задачи" + +msgid "New task with this user already exists. You are redirected to it." +msgstr "Заявка для этого абонента уже создана. Вы перенаправлены к ней." diff --git a/taskapp/templates/taskapp/details.html b/taskapp/templates/taskapp/details.html index a70ab55..f1b92ae 100644 --- a/taskapp/templates/taskapp/details.html +++ b/taskapp/templates/taskapp/details.html @@ -9,7 +9,7 @@ {% trans 'Task author' %}: {% if task and task.author %} - {{ task.author.username }} + {{ task.author.username }} {% else %} {% trans 'Not assigned' %} {% endif %}
    @@ -17,7 +17,7 @@ {% trans 'Implementers' %}: {% trans 'A priority' %}: {{ task.get_priority_display }}
    @@ -28,13 +28,13 @@ {% trans 'Condition' %}: {{ task.get_state_display }}
    {% trans 'Subscriber' %} {% if task.abon %} - {{ task.abon.get_full_name }} + {{ task.abon.get_full_name }} {% else %} {% trans 'Not assigned' %} {% endif %}
    {% if task.attachment %} {% trans 'Attachment' %}: - + {% endif %} diff --git a/taskapp/views.py b/taskapp/views.py index 5fe080b..5d57ce5 100644 --- a/taskapp/views.py +++ b/taskapp/views.py @@ -141,6 +141,16 @@ class TaskUpdateView(LoginAdminMixin, UpdateView): else: if not request.user.has_perm('taskapp.change_task'): raise PermissionDenied + + # check if new task with user already exists + uname = request.GET.get('uname') + if uname: + exists_task = Task.objects.filter(abon__username=uname, state='S') + if exists_task.exists(): + messages.info(request, _('New task with this user already exists.' + ' You are redirected to it.')) + return redirect('taskapp:edit', exists_task.first().pk) + try: return super(TaskUpdateView, self).dispatch(request, *args, **kwargs) except TaskException as e: @@ -154,6 +164,14 @@ class TaskUpdateView(LoginAdminMixin, UpdateView): return kwargs def form_valid(self, form): + # check if new task with picked user already exists + if form.cleaned_data['state'] == 'S': + exists_task = Task.objects.filter(abon=form.cleaned_data['abon'], state='S') + if exists_task.exists(): + messages.info(self.request, _('New task with this user already exists.' + ' You are redirected to it.')) + return redirect('taskapp:edit', exists_task.first().pk) + try: self.object = form.save() if self.object.author is None: