From 43ebbed5bd3f32e366d946e65f76618cc91a99fb Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Tue, 27 Feb 2018 19:40:03 +0300
Subject: [PATCH] Fix bugs

---
 abonapp/views.py                              |  2 +-
 accounts_app/templates/accounts/ext.htm       |  6 -----
 .../templates/accounts/profile_chgroup.html   | 25 -------------------
 accounts_app/urls.py                          |  1 -
 accounts_app/views.py                         | 23 -----------------
 taskapp/handle.py                             | 10 ++++----
 6 files changed, 6 insertions(+), 61 deletions(-)
 delete mode 100644 accounts_app/templates/accounts/profile_chgroup.html

diff --git a/abonapp/views.py b/abonapp/views.py
index f70b340..c5056bc 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -489,7 +489,7 @@ def passport_view(request, gid, uid):
 @mydefs.only_admins
 def chgroup_tariff(request, gid):
     grp = get_object_or_404(Group, pk=gid)
-    if not request.user.has_perm('abonapp.change_abongroup', grp):
+    if not request.user.has_perm('group_app.change_group', grp):
         raise PermissionDenied
     if request.method == 'POST':
         tr = request.POST.getlist('tr')
diff --git a/accounts_app/templates/accounts/ext.htm b/accounts_app/templates/accounts/ext.htm
index cd0e49b..fe95281 100644
--- a/accounts_app/templates/accounts/ext.htm
+++ b/accounts_app/templates/accounts/ext.htm
@@ -53,12 +53,6 @@
                         {% trans 'Administrator' %}
                     </a>
                 </li>
-                {% url 'acc_app:profile_setup_group' uid as profilegroups_url %}
-                <li{% if profilegroups_url == request.path %} class="active"{% endif %}>
-                    <a href="{{ profilegroups_url }}">
-                        {% trans 'Groups' %}
-                    </a>
-                </li>
                 {% if request.user.is_superuser %}
                 {% url 'acc_app:set_abon_groups_permission' uid as set_ag_perm %}
                 <li{% if set_ag_perm == request.path %} class="active"{% endif %}>
diff --git a/accounts_app/templates/accounts/profile_chgroup.html b/accounts_app/templates/accounts/profile_chgroup.html
deleted file mode 100644
index 018a4bc..0000000
--- a/accounts_app/templates/accounts/profile_chgroup.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends request.is_ajax|yesno:'nullcont.htm,accounts/ext.htm' %}
-{% load i18n %}
-{% block content %}
-
-    <legend>{% trans 'The responsibility of the staff of the group of subscribers' %}</legend>
-    <form action="{% url 'acc_app:profile_setup_group' userprofile.id %}" method="post" role="form">{% csrf_token %}
-        {% for ag in groups %}
-            <div class="checkbox">
-                <label>
-                {# FIXME После реализации метода возвращающего связи групп с профилями применить его тут #}
-                    {% if userprofile in ag.profiles.all %}
-                        <input name="ag" type="checkbox" value="{{ ag.pk }}" checked/>
-                    {% else %}
-                        <input name="ag" type="checkbox" value="{{ ag.pk }}"/>
-                    {% endif %}
-                    {{ ag.title }}
-                </label>
-            </div>
-        {% endfor %}
-        <div class="btn-group">
-            <input type="submit" class="btn btn-primary" value="{% trans 'Save' %}"> <input type="reset" class="btn btn-default" value="{% trans 'Reset' %}">
-        </div>
-    </form>
-
-{% endblock %}
diff --git a/accounts_app/urls.py b/accounts_app/urls.py
index 7ae5796..20567bd 100644
--- a/accounts_app/urls.py
+++ b/accounts_app/urls.py
@@ -24,7 +24,6 @@ urlpatterns = [
     url(r'^(?P<uid>\d+)/perms$', views.perms, name='setup_perms'),
     url(r'^(?P<uid>\d+)/perms/(?P<klass_name>[a-z_]+\.[a-zA-Z_]+)$', views.PermissionClassListView.as_view(), name='perms_klasses'),
     url(r'^(?P<uid>\d+)/perms/(?P<klass_name>[a-z_]+\.[a-zA-Z_]+)/(?P<obj_id>\d+)$', views.perms_edit, name='perms_edit'),
-    url(r'^(?P<uid>\d+)/chgroup$', views.chgroup, name='profile_setup_group'),
     url(r'^(?P<uid>\d+)/del$', views.delete_profile, name='delete_profile'),
 
     url(r'^(?P<uid>\d+)/user_group_access$', views.set_abon_groups_permission, name='set_abon_groups_permission')
diff --git a/accounts_app/views.py b/accounts_app/views.py
index 37edcd3..19d6fa7 100644
--- a/accounts_app/views.py
+++ b/accounts_app/views.py
@@ -89,29 +89,6 @@ def profile_show(request, uid=0):
     })
 
 
-@login_required
-@mydefs.only_admins
-def chgroup(request, uid):
-    uid = mydefs.safe_int(uid)
-    if uid == 0:
-        usr = request.user
-    else:
-        usr = get_object_or_404(UserProfile, id=uid)
-    if usr != request.user and not request.user.has_perm('accounts_app.change_userprofile', usr):
-        raise PermissionDenied
-    if request.method == 'POST':
-        ag = request.POST.getlist('ag')
-        usr.abon_groups.clear()
-        usr.abon_groups.add(*[int(d) for d in ag])
-        usr.save()
-    groups = Group.objects.only('pk', 'title')
-    return render(request, 'accounts/profile_chgroup.html', {
-        'uid': uid,
-        'userprofile': usr,
-        'groups': groups
-    })
-
-
 @login_required
 @mydefs.only_admins
 def ch_ava(request):
diff --git a/taskapp/handle.py b/taskapp/handle.py
index 4c57311..c5c136b 100644
--- a/taskapp/handle.py
+++ b/taskapp/handle.py
@@ -27,11 +27,11 @@ def handle(task, author, recipients, abon_group):
                 fulltext = "%s\n" % text
             fulltext += _('locality %s.\n') % abon_group.title
             if task.abon:
-                fulltext += _('address %(street)s %(house)s.\ntelephone %(telephone)s\n') % (
-                    task.abon.street.name if task.abon.street is not None else '<'+_('not chosen')+'>',
-                    task.abon.house,
-                    task.abon.telephone
-                )
+                fulltext += _('address %(street)s %(house)s.\ntelephone %(telephone)s\n') % {
+                    'street': task.abon.street.name if task.abon.street is not None else '<'+_('not chosen')+'>',
+                    'house': task.abon.house,
+                    'telephone': task.abon.telephone
+                }
             fulltext += _('Task type - %s.') % task.get_mode_display() + '\n'
             fulltext += task.descr if task.descr else ''