re-add draft conf for staff, add status to conf admin list

diff --git a/teleforma/admin.py b/teleforma/admin.py
index 8961cc1768d44a2ba5faf6ef08475f854b26e2d9..e16051ccbc06cee57c95f952d207f39bbcf5799e 100644 (file)
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -405,7 +405,7 @@ class ConferenceAdmin(admin.ModelAdmin):
     search_fields = ['public_id', 'id',
                      'course__code', 'course__title', 'session']
     actions = [publish_conferences, duplicate_conferences]
-    list_display = ['__str__', 'date_begin', 'public_id', 'comment']
+    list_display = ['__str__', 'date_begin', 'status', 'public_id', 'comment']
 
 
 class HomeAdmin(admin.ModelAdmin):

diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py
index 77040a292aa7c53d3c7b0fe207dd0867b7fe466a..1afbca86cbd00c2e3121734070f9c4f0b60242e9 100644 (file)
--- a/teleforma/templatetags/teleforma_tags.py
+++ b/teleforma/templatetags/teleforma_tags.py
@@ -475,11 +475,15 @@ def course_ingoing_conferences(context):
 @register.simple_tag(takes_context=True)
 def course_past_conferences(context):
     user = context['user']
+    if user.is_staff:
+        status_min = 2
+    else:
+        status_min = 3
     course = context['course']
     period = context['period']
     course_type = context['type']
 
-    return get_course_conferences(period, course, course_type)
+    return get_course_conferences(period, course, course_type, status_min=status_min)
 
 @register.simple_tag(takes_context=True)
 def conference_publication(context, conference):

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 564f2d3bcb5999bc8756b35bc91beedf0f5820c8..06f420250db3dbddfcccbf77700b1e3c2b74e714 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -137,7 +137,7 @@ def get_trainings(user):
     return trainings
 
 
-def get_course_conferences(period, course, course_type):
+def get_course_conferences(period, course, course_type, status_min=3):
     conferences = []
     already_added = set()
     # get conference publications
@@ -145,7 +145,7 @@ def get_course_conferences(period, course, course_type):
         period=period,
         conference__course=course,
         conference__course_type=course_type,
-        status=3).distinct()
+        status__gte=status_min).distinct()
     for publication in publications:
         conferences.append(publication.conference)
         already_added.add(publication.conference.id)
@@ -153,7 +153,7 @@ def get_course_conferences(period, course, course_type):
     cc = Conference.objects.filter(period=period,
         course=course,
         course_type=course_type,
-        status=3)
+        status__gte=status_min)
     for conference in cc:
         # do not include conferences with publication rules
         if conference.id not in already_added: