refactoring forms

diff --git a/auf_savoirs_en_partage/savoirs/admin_views.py b/auf_savoirs_en_partage/savoirs/admin_views.py
index 497c049..be64dfa 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/admin_views.py
+++ b/auf_savoirs_en_partage/savoirs/admin_views.py
@@ -8,6 +8,7 @@ from django.shortcuts import render_to_response
 
 from datamaster_modeles.models import Thematique, Pays, Region
 from savoirs.models import Record, Discipline, Actualite, Serveur
+from savoirs.forms import PaysForm, RegionsForm, ThematiquesForm, DisciplinesForm, ConfirmationForm
 
 # Dashboard
 class RecordDashboard:
@@ -54,27 +55,6 @@ class RecordDashboard:
         records = self.mes_records()
         return [{'title':self.ref_apercu(r), 'url':self.change_url(r), 'external': False} for r in records]
 
-# Admin views pour les associations par lots
-
-class PaysForm(forms.Form):
-    values = [(p.id, p.nom) for p in Pays.objects.all()]
-    pays = forms.MultipleChoiceField(choices=values)
-
-class RegionsForm(forms.Form):
-    values = [(r.id, r.nom) for r in Region.objects.all()]
-    regions = forms.MultipleChoiceField(choices=values)
-
-class ThematiquesForm(forms.Form):
-    values = [(t.id, t.nom) for t in Thematique.objects.all()]
-    thematiques = forms.MultipleChoiceField(choices=values)
-
-class DisciplinesForm(forms.Form):
-    values = [(t.id, t.nom) for t in Discipline.objects.all()]
-    disciplines = forms.MultipleChoiceField(choices=values)
-
-class ConfirmationForm(forms.Form):
-    pass
-
 @login_required
 def assigner_pays(request):
     ids = request.GET.get("ids").split(",")

diff --git a/auf_savoirs_en_partage/savoirs/forms.py b/auf_savoirs_en_partage/savoirs/forms.py
index 9f31c07..1119592 100644 (file)
--- a/auf_savoirs_en_partage/savoirs/forms.py
+++ b/auf_savoirs_en_partage/savoirs/forms.py
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 from django import forms
-from models import Evenement
+from datamaster_modeles.models import Thematique, Pays, Region
+from models import Evenement, Discipline
 
 class RechercheAvancee (forms.Form):
     creator = forms.CharField (max_length=60, required=False, \
@@ -18,3 +19,25 @@ class EvenementForm(forms.ModelForm):
     class Meta:
         model = Evenement
         exclude = ('approuve', 'uid', 'actif')
+
+# Admin views pour les associations par lots
+
+class PaysForm(forms.Form):
+    values = [(p.id, p.nom) for p in Pays.objects.all()]
+    pays = forms.MultipleChoiceField(choices=values)
+
+class RegionsForm(forms.Form):
+    values = [(r.id, r.nom) for r in Region.objects.all()]
+    regions = forms.MultipleChoiceField(choices=values)
+
+class ThematiquesForm(forms.Form):
+    values = [(t.id, t.nom) for t in Thematique.objects.all()]
+    thematiques = forms.MultipleChoiceField(choices=values)
+
+class DisciplinesForm(forms.Form):
+    values = [(t.id, t.nom) for t in Discipline.objects.all()]
+    disciplines = forms.MultipleChoiceField(choices=values)
+
+class ConfirmationForm(forms.Form):
+    pass
+