More orga renaming fixes

apps/challenge/templates/challenge/session_form.html

@@ -45,7 +45,7 @@ <h1>{% if session %}{% trans "Édition de la session" %}{% else %}{% trans "Nouv
     <form method="POST" action="" class="form-horizontal">
         {% csrf_token %}
         <h3>{% trans "Emplacement" %}</h3>
-        {% bootstrap_field form.organization layout='horizontal' size='small' %}
+        {% bootstrap_field form.orga layout='horizontal' size='small' %}
         {% bootstrap_field form.day layout='horizontal' size='small' %}
         {% bootstrap_field form.begin layout='horizontal' size='small' %}
         {% bootstrap_field form.place layout='horizontal' size='small' %}

apps/challenge/tests/factories.py

@@ -45,5 +45,5 @@ class SessionFactory(DjangoModelFactory):
     class Meta:
         model = Session
 
-    organization = factory.SubFactory(OrganizationFactory)
+    orga = factory.SubFactory(OrganizationFactory)
     day = fuzzy.FuzzyDate(date(2015, 5, 2), date(2015, 6, 30))

apps/challenge/tests/test_seasons.py

@@ -57,8 +57,8 @@ def setUp(self):
         self.sessions = []
         for canton in self.mycantons:
             s = SessionFactory()
-            s.organization.address_canton = canton
-            s.organization.save()
+            s.orga.address_canton = canton
+            s.orga.save()
             s.save()
             self.sessions.append(s)
 
@@ -71,8 +71,8 @@ def setUp(self):
         self.foreignsessions = []
         for canton in self.foreigncantons:
             s = SessionFactory()
-            s.organization.address_canton = canton
-            s.organization.save()
+            s.orga.address_canton = canton
+            s.orga.save()
             s.save()
             self.foreignsessions.append(s)
 
@@ -270,21 +270,21 @@ def test_session_creation(self):
             'begin': '09:00',
             }
 
-        # 200 because we're back on the page, because organization' empty
+        # 200 because we're back on the page, because orga' empty
         response = self.client.post(url, initial)
         self.assertEqual(response.status_code, 200, url)
 
         orga = OrganizationFactory(
             address_canton=self.foreignseason.cantons[0]
         )
-        initial['organization'] = orga.pk
-        # 200 because we're back on the page, because organization is not
+        initial['orga'] = orga.pk
+        # 200 because we're back on the page, because orga is not
         # in our canton
         response = self.client.post(url, initial)
         self.assertEqual(response.status_code, 200, url)
 
         orga = OrganizationFactory(address_canton=self.season.cantons[0])
-        initial['organization'] = orga.pk
+        initial['orga'] = orga.pk
         # That works now
         response = self.client.post(url, initial)
         self.assertEqual(response.status_code, 302, url)

apps/challenge/views/season.py

@@ -276,12 +276,12 @@ def get_dataset(self):
             if not session_place:
                 session_place = (
                     session.address_city if session.address_city
-                    else session.organization.address_city
+                    else session.orga.address_city
                 )
             col = [
                 date(session.day),
-                session.organization.address_canton,
-                session.organization.name,
+                session.orga.address_canton,
+                session.orga.name,
                 session_place,
                 '%s - %s' % (time(session.begin), time(session.end)),
                 session.n_qualifications,
@@ -389,12 +389,12 @@ def get_dataset(self):
             if not session_place:
                 session_place = (
                     session.address_city if session.address_city
-                    else session.organization.address_city
+                    else session.orga.address_city
                 )
             col = [
                 date(session.day),
-                session.organization.address_canton,
-                session.organization.name,
+                session.orga.address_canton,
+                session.orga.name,
                 session_place,
                 '%s - %s' % (time(session.begin), time(session.end)),
                 session.n_qualifications,

apps/challenge/views/session.py

@@ -50,7 +50,7 @@ def get_queryset(self):
         qs = super(SessionMixin, self).get_queryset()
         try:
             return qs.filter(
-                    organization__address_canton__in=self.season.cantons
+                    orga__address_canton__in=self.season.cantons
                 )
         except FieldError:
             # For the cases qs is Qualification, not Session
@@ -109,7 +109,7 @@ def get_queryset(self):
         return (
             super(SessionDetailView, self).get_queryset()
             .prefetch_related(
-                'organization',
+                'orga',
                 'qualifications',
                 'qualifications__leader',
                 'qualifications__leader__profile',
@@ -187,12 +187,12 @@ def get_dataset(self):
         if not session_place:
             session_place = (
                 session.address_city if session.address_city
-                else session.organization.address_city
+                else session.orga.address_city
             )
         col = [
             date(session.day),
-            session.organization.address_canton,
-            session.organization.name,
+            session.orga.address_canton,
+            session.orga.name,
             session_place,
             '%s - %s' % (time(session.begin), time(session.end)),
             session.n_qualifications,

defivelo/tests/utils.py

@@ -22,7 +22,7 @@
 from django.test import Client
 from django.utils.translation import activate
 from faker import Faker
-from rolepermissions.shortcuts import assign_role
+from rolepermissions.roles import assign_role
 
 from apps.common import DV_STATES
 from apps.user import get_new_username