From 540bb1acbc04808d31d20ee57b9c1136b2113d9e Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 16 Dec 2016 20:41:26 +0000 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=BB=D0=B8=D0=B7=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BD=D0=B0=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BD=D0=B8=D0=BA?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=BD=D0=B0=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF?= =?UTF-8?q?=D1=8B=20=D0=B0=D0=B1=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- accounts_app/views.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/accounts_app/views.py b/accounts_app/views.py index 641076e..ef7b6a2 100644 --- a/accounts_app/views.py +++ b/accounts_app/views.py @@ -6,7 +6,7 @@ from django.shortcuts import render, redirect, get_object_or_404, resolve_url from django.template.context_processors import csrf from django.http import Http404 from django.contrib.auth.models import Group, Permission -from accounts_app.forms import SetupPerms +from abonapp.models import AbonGroup from photo_app.models import Photo from models import UserProfile @@ -81,15 +81,16 @@ def profile_show(request, id=0): @mydefs.only_admins def chgroup(request, uid): usr = get_object_or_404(UserProfile, id=uid) - usergroups = usr.groups.all() - othergroups = filter(lambda g: g not in usergroups, Group.objects.all()) - # Group.objects.exclude(user__in=usergroups) - + 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() + abongroups = AbonGroup.objects.all() return render(request, 'accounts/profile_chgroup.html', { 'uid': uid, 'userprofile': usr, - 'allgroups': othergroups, - 'usergroups': usergroups + 'abongroups': abongroups }) @@ -215,12 +216,10 @@ def acc_list(request): # @permission_required('accounts_app.change_userprofile') def perms(request, id): profile = get_object_or_404(UserProfile, id=id) - frm = SetupPerms() own_permissions = UserProfile.get_all_permissions(profile) return render(request, 'accounts/settings/permissions.html', { 'uid': id, - 'form': frm, 'own_permissions': own_permissions })