Merge branch 'master' into Kerl/fix_32_do_tirage

gestioncof/admin.py

@@ -46,12 +46,14 @@ class SurveyQuestionInline(admin.TabularInline):
 
 
 class SurveyQuestionAdmin(admin.ModelAdmin):
+    search_fields = ('survey__title', 'answer')
     inlines = [
         SurveyQuestionAnswerInline,
     ]
 
 
 class SurveyAdmin(admin.ModelAdmin):
+    search_fields = ('title', 'details')
     inlines = [
         SurveyQuestionInline,
     ]
@@ -72,12 +74,14 @@ class EventCommentFieldInline(admin.TabularInline):
 
 
 class EventOptionAdmin(admin.ModelAdmin):
+    search_fields = ('event__title', 'name')
     inlines = [
         EventOptionChoiceInline,
     ]
 
 
 class EventAdmin(admin.ModelAdmin):
+    search_fields = ('title', 'location', 'description')
     inlines = [
         EventOptionInline,
         EventCommentFieldInline,
@@ -189,6 +193,7 @@ class PetitCoursAbilityAdmin(admin.ModelAdmin):
 
 class PetitCoursAttributionAdmin(admin.ModelAdmin):
     list_display = ('user', 'demande', 'matiere', 'rank', )
+    search_fields = ('user__username', 'matiere__name')
 
 
 class PetitCoursAttributionCounterAdmin(admin.ModelAdmin):
@@ -208,6 +213,11 @@ class PetitCoursDemandeAdmin(admin.ModelAdmin):
     list_display = ('name', 'email', 'agrege_requis', 'niveau', 'created',
                     'traitee', 'processed')
     list_filter = ('traitee', 'niveau')
+    search_fields = ('name', 'email', 'phone', 'lieu', 'remarques')
+
+
+class CustomMailAdmin(admin.ModelAdmin):
+    search_fields = ('shortname', 'title')
 
 admin.site.register(Survey, SurveyAdmin)
 admin.site.register(SurveyQuestion, SurveyQuestionAdmin)

gestioncof/migrations/0004_registration_mail.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def create_mail(apps, schema_editor):
+    CustomMail = apps.get_model("gestioncof", "CustomMail")
+    db_alias = schema_editor.connection.alias
+    if CustomMail.objects.filter(shortname="bienvenue").count() == 0:
+        CustomMail.objects.using(db_alias).bulk_create([
+            CustomMail(
+                shortname="bienvenue",
+                title="Bienvenue au COF",
+                content="Mail de bienvenue au COF, envoyé automatiquement à " \
+                    + "l'inscription.\n\n" \
+                    + "Les balises {{ ... }} sont interprétées comme expliqué " \
+                    + "ci-dessous à l'envoi.",
+                comments="{{ nom }} \t fullname de la personne.\n"\
+                    + "{{ prenom }} \t prénom de la personne.")
+        ])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gestioncof', '0003_event_image'),
+    ]
+
+    operations = [
+        # Pas besoin de supprimer le mail lors de la migration dans l'autre
+        # sens.
+        migrations.RunPython(create_mail, migrations.RunPython.noop),
+    ]

gestioncof/models.py

@@ -94,7 +94,8 @@ class CustomMail(models.Model):
                                 blank=True)
 
     class Meta:
-        verbose_name = "Mails personnalisables"
+        verbose_name = "Mail personnalisable"
+        verbose_name_plural = "Mails personnalisables"
 
     def __unicode__(self):
         return u"%s: %s" % (self.shortname, self.title)
@@ -158,6 +159,7 @@ class EventOptionChoice(models.Model):
 
     class Meta:
         verbose_name = "Choix"
+        verbose_name_plural = "Choix"
 
     def __unicode__(self):
         return unicode(self.value)