From 97a5d729ee16d3d291a8d66ba0947ee2f49e5f25 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 26 Jan 2023 08:28:26 +0100 Subject: [PATCH] re-add draft conf for staff, add status to conf admin list --- teleforma/admin.py | 2 +- teleforma/templatetags/teleforma_tags.py | 6 +++++- teleforma/views/core.py | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/teleforma/admin.py b/teleforma/admin.py index 8961cc17..e16051cc 100644 --- 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 77040a29..1afbca86 100644 --- 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 564f2d3b..06f42025 100644 --- 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: -- 2.39.5