From 04d0ed7732f0b039187882af2672544edb1d5ffb Mon Sep 17 00:00:00 2001 From: Gael Le Mignot Date: Tue, 13 Nov 2018 14:34:30 +0100 Subject: [PATCH] Hiding media from correctors --- teleforma/models/core.py | 4 ++-- teleforma/templates/teleforma/course.html | 3 +++ teleforma/templates/teleforma/course_detail.html | 2 +- teleforma/templates/teleforma/courses.html | 4 ++++ teleforma/views/core.py | 2 ++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/teleforma/models/core.py b/teleforma/models/core.py index a03aac3b..5b054c97 100644 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -91,10 +91,10 @@ def get_random_hash(): def get_user_role(user): if user.is_superuser: return 'superuser' - elif user.student.exists(): - return 'student' elif user.professor.exists(): return 'professor' + elif user.student.exists(): + return 'student' else: return 'corrector' diff --git a/teleforma/templates/teleforma/course.html b/teleforma/templates/teleforma/course.html index 65d2f05d..81d940f3 100644 --- a/teleforma/templates/teleforma/course.html +++ b/teleforma/templates/teleforma/course.html @@ -27,6 +27,7 @@ {% endfor %} +{% if show_media %}

{% trans "Medias"%}

@@ -58,6 +59,8 @@ +{% endif %} +
{{ conference.date_begin }}
{% endfor %} diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html index 56cccda4..af1ba6e5 100644 --- a/teleforma/templates/teleforma/course_detail.html +++ b/teleforma/templates/teleforma/course_detail.html @@ -50,7 +50,7 @@ $(document).ready(function(){ {% else %} - {% if not user.correctors.all or user.is_staff %} + {% if show_media %} {% block conference %} {% include "teleforma/inc/conference_list.html" %} {% endblock %} diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html index 573bc1b5..5ee3435a 100644 --- a/teleforma/templates/teleforma/courses.html +++ b/teleforma/templates/teleforma/courses.html @@ -116,6 +116,8 @@ $(document).ready(function(){ {{ course.title }} - {{ type }}{% if course.description %} - {{ course.description }}{% endif %} + {% if show_media %} + {% block conference %} {% include "teleforma/inc/conference_list.html" %} {% endblock %} @@ -134,6 +136,8 @@ $(document).ready(function(){ {% endblock %} {% endcomment %} + {% endif %} + {% block document %} {% with forloop.counter as type_counter %} {% include "teleforma/inc/document_list.html" %} diff --git a/teleforma/views/core.py b/teleforma/views/core.py index dde0e9bd..6bfa30e5 100644 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@ -321,8 +321,10 @@ class CourseAccessMixin(PeriodAccessMixin): role = get_user_role(self.request.user) if role == "corrector": context['doc_types'] = DocumentType.objects.filter(for_corrector = True) + context['show_media'] = False else: context['doc_types'] = DocumentType.objects.all() + context['show_media'] = True return context -- 2.39.5