diff --git a/evenementiel/urls.py b/evenementiel/urls.py index ee8de46..4d67472 100644 --- a/evenementiel/urls.py +++ b/evenementiel/urls.py @@ -1,7 +1,6 @@ """ GestionEvenmentiel URL configuration """ -from django.conf import settings from django.conf.urls import url, include from django.contrib import admin diff --git a/event/models.py b/event/models.py index 9605070..7723796 100644 --- a/event/models.py +++ b/event/models.py @@ -158,9 +158,7 @@ class Activity(ActivityTemplate): def get_herited(self, attrname): attr = super(Activity, self).__getattribute__(attrname) - if (attrname == 'parent' - or attrname == 'staff' - or attrname == 'equipment'): + if attrname in {"parent", "staff", "equipment"}: raise FieldError( _("%(attrname)s n'est pas un champ héritable"), params={'attrname': attrname}, diff --git a/event/tests.py b/event/tests.py index e634b82..dbf0cf2 100644 --- a/event/tests.py +++ b/event/tests.py @@ -92,24 +92,24 @@ class ActivityInheritanceTest(TestCase): self.template_act.place.add(self.loge) self.assertEqual( self.real_act.get_herited('place').get().name, - "Loge 45" + self.loge ) self.real_act.place.add(self.aqua) self.assertEqual( self.real_act.get_herited('place').get().name, - "Aquarium" + self.aqua ) def test_inherites_tags(self): self.template_act.tags.add(self.tag_foo) self.assertEqual( self.real_act.get_herited('tags').get().name, - "foo" + self.tag_foo ) self.real_act.tags.add(self.tag_bar) self.assertEqual( self.real_act.get_herited('tags').get().name, - "bar" + self.tag_bar ) diff --git a/users/forms.py b/users/forms.py index bdc86ea..7ba4fc3 100644 --- a/users/forms.py +++ b/users/forms.py @@ -6,12 +6,12 @@ from django.conf import settings class CreateUserForm(UserCreationForm): key = forms.CharField( - label="Clée de sécurité", + label="Clef de sécurité", widget=forms.PasswordInput, - help_text="Cette clée est fournie par l'administrat-rice-eur " + help_text="Cette clef est fournie par l'administrat·rice·eur " "du site. Pour en obtenir une veuillez la-le contacter." ) - error_m = {'wrong_key': "La clef fournie est eronnée."} + error_m = {'wrong_key': "La clef fournie est erronée."} class Meta: model = User diff --git a/users/views.py b/users/views.py index 4b2ae3f..04014e0 100644 --- a/users/views.py +++ b/users/views.py @@ -3,13 +3,15 @@ from django.views.generic.edit import CreateView from django.contrib.messages.views import SuccessMessageMixin from django.core.urlresolvers import reverse_lazy + class CreateUser(SuccessMessageMixin, CreateView): - template_name = 'users/user_form.html' - form_class = CreateUserForm - success_url = reverse_lazy('erkan:index') + template_name = 'users/user_form.html' + form_class = CreateUserForm + success_url = reverse_lazy('shared:home') success_message = "Votre compte utilisateur a été correctement créé !" + def get_context_data(self, **kwargs): - ctx = super(CreateUser, self).get_context_data(**kwargs) - ctx['button'] = 'Créer' + ctx = super(CreateUser, self).get_context_data(**kwargs) + ctx['button'] = 'Créer' ctx['page_title'] = "Création d'utilisateur" return ctx