diff --git a/bda/admin.py b/bda/admin.py index fc10c326..26f6042f 100644 --- a/bda/admin.py +++ b/bda/admin.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -import autocomplete_light from datetime import timedelta from custommail.shortcuts import send_mass_custom_mail @@ -119,8 +118,6 @@ class AttributionAdmin(admin.ModelAdmin): class ChoixSpectacleAdmin(admin.ModelAdmin): - form = autocomplete_light.modelform_factory(ChoixSpectacle, exclude=[]) - def tirage(self, obj): return obj.participant.tirage list_display = ("participant", "tirage", "spectacle", "priority", diff --git a/bda/apps.py b/bda/apps.py new file mode 100644 index 00000000..583936c7 --- /dev/null +++ b/bda/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class BdAConfig(AppConfig): + name = "bda" + verbose_name = "Gestion des tirages du BdA" diff --git a/bda/autocomplete_light_registry.py b/bda/autocomplete_light_registry.py deleted file mode 100644 index 6c2f3ea6..00000000 --- a/bda/autocomplete_light_registry.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- - -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -import autocomplete_light - -from bda.models import Participant, Spectacle - -autocomplete_light.register( - Participant, search_fields=('user__username', 'user__first_name', - 'user__last_name'), - autocomplete_js_attributes={'placeholder': 'participant...'}) - -autocomplete_light.register( - Spectacle, search_fields=('title', ), - autocomplete_js_attributes={'placeholder': 'spectacle...'}) diff --git a/bds/apps.py b/bds/apps.py new file mode 100644 index 00000000..7c08d34e --- /dev/null +++ b/bds/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class BDSConfig(AppConfig): + name = "bds" + verbose_name = "Application de gestion du BDS" diff --git a/bds/migrations/0002_add_BDS_groups.py b/bds/migrations/0002_add_BDS_groups.py index f0b4a75c..45510e59 100644 --- a/bds/migrations/0002_add_BDS_groups.py +++ b/bds/migrations/0002_add_BDS_groups.py @@ -1,33 +1,16 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.contrib.auth.models import Group, Permission from django.db import migrations def create_groups(apps, schema_editor): - from django.contrib.auth.management import create_permissions - - apps.models_module = True - create_permissions(apps, verbosity=0) - apps.models_module = None - - memberp = Permission.objects.get( - codename="member", - content_type__app_label="bds" - ) - burop = Permission.objects.get( - codename="buro", - content_type__app_label="bds" - ) - - # Creates the groups for BDS members and staff - member = Group.objects.create(name="bds_members") - buro = Group.objects.create(name="bds_buro") - - # Associates the permissions to the respective groups - member.permissions = [memberp] - buro.permissions = [memberp, burop] + """ + Creates the groups for BDS members and staff + """ + Group = apps.get_model("auth", "Group") + Group.objects.get_or_create(name="bds_members") + Group.objects.get_or_create(name="bds_buro") class Migration(migrations.Migration): diff --git a/cof/admin.py b/cof/admin.py index 227cfb55..fc6fe515 100644 --- a/cof/admin.py +++ b/cof/admin.py @@ -5,8 +5,6 @@ from django.core.urlresolvers import reverse from django.utils.safestring import mark_safe import django.utils.six as six -import autocomplete_light - from .petits_cours_models import PetitCoursDemande, \ PetitCoursSubject, PetitCoursAbility, PetitCoursAttribution, \ PetitCoursAttributionCounter @@ -94,7 +92,6 @@ class EventAdmin(admin.ModelAdmin): class EventRegistrationAdmin(admin.ModelAdmin): - form = autocomplete_light.modelform_factory(EventRegistration, exclude=[]) list_display = ('__unicode__' if six.PY2 else '__str__', 'event', 'user', 'paid') list_filter = ('paid',) diff --git a/cof/apps.py b/cof/apps.py new file mode 100644 index 00000000..f981ee91 --- /dev/null +++ b/cof/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class COFConfig(AppConfig): + name = "cof" + verbose_name = "Application de gestion du COF" diff --git a/cof/autocomplete_light_registry.py b/cof/autocomplete_light_registry.py deleted file mode 100644 index 4c62d995..00000000 --- a/cof/autocomplete_light_registry.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- - -import autocomplete_light - -from django.contrib.auth.models import User - -autocomplete_light.register( - User, search_fields=('username', 'first_name', 'last_name'), - attrs={'placeholder': 'membre...'} -) diff --git a/cof/forms.py b/cof/forms.py index eac9f2ed..e707194e 100644 --- a/cof/forms.py +++ b/cof/forms.py @@ -12,8 +12,7 @@ from django.forms.formsets import BaseFormSet, formset_factory from django.db.models import Max from django.core.validators import MinLengthValidator -from .models import CofProfile, EventCommentValue, \ - CalendarSubscription, Club +from .models import CofProfile, EventCommentValue, CalendarSubscription from .widgets import TriStateCheckbox from gestion.models import Profile @@ -368,14 +367,3 @@ class CalendarForm(forms.ModelForm): model = CalendarSubscription fields = ['subscribe_to_events', 'subscribe_to_my_shows', 'other_shows'] - - -class ClubsForm(forms.Form): - """ - Formulaire d'inscription d'un membre à plusieurs clubs du COF. - """ - clubs = forms.ModelMultipleChoiceField( - label="Inscriptions aux clubs du COF", - queryset=Club.objects.all(), - widget=forms.CheckboxSelectMultiple, - required=False) diff --git a/cof/templates/home.html b/cof/templates/home.html index be2edbe6..7574e06e 100644 --- a/cof/templates/home.html +++ b/cof/templates/home.html @@ -72,7 +72,6 @@
  • Administration générale
  • Demandes de petits cours
  • Inscription d'un nouveau membre
    • -
  • Gestion des clubs