From ce28b258e899fbd5d7e9ca20eb95c9d24be396b0 Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Thu, 1 Mar 2018 14:02:55 +0300
Subject: [PATCH] Fix bugs

---
 abonapp/locale/ru/LC_MESSAGES/django.po      |  3 +++
 abonapp/templates/abonapp/group_tariffs.html |  3 +--
 abonapp/views.py                             | 10 ++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po
index f95800b..27b7a3f 100644
--- a/abonapp/locale/ru/LC_MESSAGES/django.po
+++ b/abonapp/locale/ru/LC_MESSAGES/django.po
@@ -1135,3 +1135,6 @@ msgstr "Звонки"
 
 msgid "Subscribers"
 msgstr "Абоненты"
+
+msgid "Successfully saved"
+msgstr "Успешно сохранено"
diff --git a/abonapp/templates/abonapp/group_tariffs.html b/abonapp/templates/abonapp/group_tariffs.html
index 2e786f0..bb9bef9 100644
--- a/abonapp/templates/abonapp/group_tariffs.html
+++ b/abonapp/templates/abonapp/group_tariffs.html
@@ -16,8 +16,7 @@
         {% for tariff in tariffs %}
             <div class="checkbox">
                 <label>
-                    {# FIXME после создания метода привязки тарифов к группам применить его тут #}
-                    {% if tariff in abon_group.tariffs.all %}
+                    {% if tariff.pk in seleted_tariffs %}
                         <input name="tr" type="checkbox" value="{{ tariff.pk }}" checked/>
                     {% else %}
                         <input name="tr" type="checkbox" value="{{ tariff.pk }}"/>
diff --git a/abonapp/views.py b/abonapp/views.py
index c5056bc..0833be0 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -493,14 +493,16 @@ def chgroup_tariff(request, gid):
         raise PermissionDenied
     if request.method == 'POST':
         tr = request.POST.getlist('tr')
-
-        # FIXME после создания метода привязки тарифов к группам убрать это представление
-        grp.tariffs.clear()
-        grp.tariffs.add(*[int(d) for d in tr])
+        grp.tariff_set.clear()
+        grp.tariff_set.add(*[int(d) for d in tr])
         grp.save()
+        messages.success(request, _('Successfully saved'))
+        return redirect('abonapp:ch_group_tariff', gid)
     tariffs = Tariff.objects.all()
+    seleted_tariffs_id = [pk[0] for pk in grp.tariff_set.only('pk').values_list('pk')]
     return render(request, 'abonapp/group_tariffs.html', {
         'group': grp,
+        'seleted_tariffs': seleted_tariffs_id,
         'tariffs': tariffs
     })