Merge branch 'qwann/views/shared' into qwann/move_user

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
 

event/models.py

@@ -158,9 +158,7 @@ class Activity(ActivityTemplate):
 
     def get_herited(self, attrname):
         attr = super(Activity, self).__getattribute__(attrname)
-        if (attrname == 'parent'
+        if attrname in {"parent", "staff", "equipment"}:
-                or attrname == 'staff'
-                or attrname == 'equipment'):
             raise FieldError(
                     _("%(attrname)s n'est pas un champ héritable"),
                     params={'attrname': attrname},

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
             )
 
 

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

users/views.py

@@ -3,11 +3,13 @@ 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')
+    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'