From af3a7cf6971bfead6541f76048f61dc0407fb5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= <aurelien.delobelle@gmail.com>
Date: Tue, 24 Oct 2017 17:56:14 +0200
Subject: [PATCH] =?UTF-8?q?Reapply=20fix=20to=20kfetauth=20(=E2=80=A6)=20a?=
 =?UTF-8?q?nd=20fix=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kfet/auth/forms.py       |  4 ++++
 kfet/tests/test_views.py | 14 --------------
 kfet/views.py            |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/kfet/auth/forms.py b/kfet/auth/forms.py
index 0c9fa53b..876e8814 100644
--- a/kfet/auth/forms.py
+++ b/kfet/auth/forms.py
@@ -18,6 +18,8 @@ class GroupForm(forms.ModelForm):
         # other_groups = self.instance.permissions.difference(
         #     self.fields['permissions'].queryset
         # )
+        if self.instance.pk is None:
+            return kfet_perms
         other_perms = self.instance.permissions.exclude(
             pk__in=[p.pk for p in self.fields['permissions'].queryset],
         )
@@ -36,6 +38,8 @@ class UserGroupForm(forms.ModelForm):
 
     def clean_groups(self):
         kfet_groups = self.cleaned_data.get('groups')
+        if self.instance.pk is None:
+            return kfet_groups
         other_groups = self.instance.groups.exclude(name__icontains='K-Fêt')
         return list(kfet_groups) + list(other_groups)
 
diff --git a/kfet/tests/test_views.py b/kfet/tests/test_views.py
index ff9803c9..c7ed5dda 100644
--- a/kfet/tests/test_views.py
+++ b/kfet/tests/test_views.py
@@ -18,20 +18,6 @@ from .testcases import ViewTestCaseMixin
 from .utils import create_team, create_user, get_perms
 
 
-class LoginGenericTeamViewTests(ViewTestCaseMixin, TestCase):
-    url_name = 'kfet.login.genericteam'
-    url_expected = '/k-fet/login/genericteam'
-
-    auth_user = 'team'
-    auth_forbidden = [None, 'user']
-
-    def test_ok(self):
-        r = self.client.get(self.url)
-        self.assertEqual(r.status_code, 200)
-        logged_in = r.wsgi_request.user
-        self.assertEqual(logged_in.username, 'kfet_genericteam')
-
-
 class AccountListViewTests(ViewTestCaseMixin, TestCase):
     url_name = 'kfet.account'
     url_expected = '/k-fet/accounts/'
diff --git a/kfet/views.py b/kfet/views.py
index 7a28819e..f1dd6834 100644
--- a/kfet/views.py
+++ b/kfet/views.py
@@ -12,7 +12,7 @@ from django.views.generic.edit import CreateView, UpdateView
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.contrib import messages
 from django.contrib.messages.views import SuccessMessageMixin
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.models import User, Permission
 from django.http import JsonResponse, Http404
 from django.forms import formset_factory