From: yomguy <yomguy@parisson.com>
Date: Tue, 15 Jan 2013 11:13:35 +0000 (+0100)
Subject: again
X-Git-Tag: 1.1~655
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a3b575acc314d923ddd86caf245c09ef7cdc83d1;p=teleforma.git

again
---

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index c548b48e..fde57215 100644
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -154,12 +154,7 @@ def get_random_hash():
     return "%032x" % hash
 
 def get_periods(user):
-    professor = user.professor.all()
-    if professor:
-        professor = user.professor.get()
-        periods = Period.objects.all()
-
-    elif settings.TELEFORMA_E_LEARNING_TYPE == 'CRFPA':
+    if settings.TELEFORMA_E_LEARNING_TYPE == 'CRFPA':
         student = user.crfpa_student.all()
         if student:
             student = user.crfpa_student.get()
@@ -171,7 +166,12 @@ def get_periods(user):
             student = user.ae_student.get()
             periods = student.period.all()
 
-    elif user.is_superuser or user.if_staff:
+    if user.is_superuser or user.if_staff:
+        periods = Period.objects.all()
+
+    professor = user.professor.all()
+    if professor:
+        professor = user.professor.get()
         periods = Period.objects.all()
 
     return periods