From 1f85f7589663a650e1337d803086a053b9919d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Mon, 20 Feb 2017 01:16:50 +0100
Subject: [PATCH] Include the Clubs into the admin site

---
 cof/admin.py     | 22 +---------------------
 gestion/admin.py | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/cof/admin.py b/cof/admin.py
index 177a5adf..227cfb55 100644
--- a/cof/admin.py
+++ b/cof/admin.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from django import forms
 from django.contrib import admin
 from django.core.urlresolvers import reverse
 from django.utils.safestring import mark_safe
@@ -13,7 +12,7 @@ from .petits_cours_models import PetitCoursDemande, \
     PetitCoursAttributionCounter
 from .models import (
     SurveyQuestionAnswer, SurveyQuestion, CofProfile, EventOption,
-    EventOptionChoice, Event, Club, EventCommentField, EventRegistration,
+    EventOptionChoice, Event, EventCommentField, EventRegistration,
     Survey
 )
 
@@ -135,30 +134,11 @@ class PetitCoursDemandeAdmin(admin.ModelAdmin):
     search_fields = ('name', 'email', 'phone', 'lieu', 'remarques')
 
 
-class ClubAdminForm(forms.ModelForm):
-    def clean(self):
-        cleaned_data = super(ClubAdminForm, self).clean()
-        respos = cleaned_data.get('respos')
-        members = cleaned_data.get('membres')
-        for respo in respos.all():
-            if respo not in members:
-                raise forms.ValidationError(
-                    "Erreur : le respo %s n'est pas membre du club."
-                    % respo.get_full_name())
-        return cleaned_data
-
-
-class ClubAdmin(admin.ModelAdmin):
-    list_display = ['name']
-    form = ClubAdminForm
-
-
 admin.site.register(Survey, SurveyAdmin)
 admin.site.register(SurveyQuestion, SurveyQuestionAdmin)
 admin.site.register(Event, EventAdmin)
 admin.site.register(EventOption, EventOptionAdmin)
 admin.site.register(CofProfile)
-admin.site.register(Club, ClubAdmin)
 admin.site.register(PetitCoursSubject)
 admin.site.register(PetitCoursAbility, PetitCoursAbilityAdmin)
 admin.site.register(PetitCoursAttribution, PetitCoursAttributionAdmin)
diff --git a/gestion/admin.py b/gestion/admin.py
index 52e3cb55..a25c618d 100644
--- a/gestion/admin.py
+++ b/gestion/admin.py
@@ -2,9 +2,13 @@ from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
 
-from .models import Profile
+from .models import Profile, Club
 
 
+# ---
+# The user related stuff
+# ---
+
 class ProfileInline(admin.StackedInline):
     model = Profile
     inline_classes = ["collapse open"]
@@ -16,5 +20,14 @@ class UserProfileAdmin(UserAdmin):
     ]
 
 
+# ---
+# Clubs
+# ---
+
+@admin.register(Club)
+class ClubAdmin(admin.ModelAdmin):
+    pass
+
+
 admin.site.unregister(User)
 admin.site.register(User, UserProfileAdmin)