From: yomguy <yomguy@parisson.com>
Date: Wed, 7 Nov 2012 11:28:01 +0000 (+0100)
Subject: fix no conf type, add X (test) course to CRFPA, fix media title
X-Git-Tag: 0.9-probarreau~322
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fb489c579cd3dc55ee266dd8c93e801f14d9a4b5;p=teleforma.git

fix no conf type, add X (test) course to CRFPA, fix media title
---

diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index e29a721d..68efeb88 100644
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -80,7 +80,7 @@ $(document).ready(function(){
         {% endif %}
     </div>
 
-    <a href="{% url teleforma-course-detail course.id %}" style="color: #000;">{{ course.title }}</a> - {{ type }}{% if media.conference.session %} - {% trans "Session" %} {{ media.conference.session }}{% endif %}
+    <a href="{% url teleforma-course-detail course.id %}" style="color: #000;">{{ course.title }}</a>{% if type.name != "None" %} - {{ type }}{% endif %}{% if media.conference.session %} - {% trans "Session" %} {{ media.conference.session }}{% endif %}
 
 </div>
 
diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 6b58cfbf..62577044 100644
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -478,7 +478,11 @@ class ConferenceRecordView(FormView):
     def create(request, conference):
         if isinstance(conference, dict):
             course = Course.objects.get(code=conference['course_code'])
-            course_type = CourseType.objects.get(name=conference['course_type'])
+            if conference['course_type']:
+                course_type = CourseType.objects.get(name=conference['course_type'])
+            else:
+                course_type, cc = CourseType.objects.get_or_create(name='None')
+
             conf, c = Conference.objects.get_or_create(public_id=conference['id'],
                                                        course=course, course_type=course_type)
             if c:
diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py
index 96439d4d..42493e43 100644
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@ -36,14 +36,14 @@
 from teleforma.views.core import *
 
 
-def format_crfpa_courses(courses, course=None, queryset=None, types=None):
+def format_crfpa_courses(courses, course=None, queryset=None, types=None, admin=False):
     if queryset:
         for c in queryset:
-            if c and c.code != 'X':
+            if c and (c.code != 'X' or admin == True):
                 courses.append({'course': c, 'types': types.all(),
                 'date': c.date_modified, 'number': c.number})
     elif course:
-        if course.code != 'X':
+        if course.code != 'X' or admin == True:
             courses.append({'course': course, 'types': types.all(),
             'date': course.date_modified, 'number': course.number})
     return courses
@@ -97,7 +97,7 @@ def get_crfpa_courses(user, date_order=False, num_order=False):
 
     elif user.is_staff or user.is_superuser:
         courses = format_crfpa_courses(courses, queryset=Course.objects.all(),
-                    types=CourseType.objects)
+                    types=CourseType.objects, admin=True)
     else:
         courses = None