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 e29a721d47a6394ff105de16770bb0c6ad88d988..68efeb88ca4bab49afd2f41b0d19d6ff7840e027 100644 (file)
--- 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 6b58cfbf12714d8ccdcc4029b0bfab2cb0c28a3e..625770445e3a63cf1967a87b5a62284eea96b0e7 100644 (file)
--- 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 96439d4d8d306b808540c56f2740dd3275db9d9e..42493e43fc8da52d1fa16df4be1075e8dee4575a 100644 (file)
--- 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