Hiding media from correctors

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index a03aac3b7fbc652cdfb6baf3414871b11d14ed41..5b054c978f3449394fad00224473c4ca12dc2810 100644 (file)
--- 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 65d2f05dcc3bfbf87e2a5a05b94d14979d5dc6ec..81d940f322967b8a5d1bb215b543869be0b37fae 100644 (file)
--- a/teleforma/templates/teleforma/course.html
+++ b/teleforma/templates/teleforma/course.html
@@ -27,6 +27,7 @@
 {% endfor %}
 </table>
 
+{% if show_media %}
 <h2>{% trans "Medias"%}</h2>
 <table class="listing" width="100%">
 <tr>
@@ -58,6 +59,8 @@
 <td>{{ conference.date_begin }}</td>
 </tr>
 
+{% endif %}
+
 </table>
 
 {% endfor %}

diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index 56cccda4bf4c7ab152dab2a42d05486f14ef64d7..af1ba6e57526c3ebfa1af2b75966739f23b35aae 100644 (file)
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -50,7 +50,7 @@ $(document).ready(function(){
           </div>
 
         {% 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 573bc1b5f06613eef73e09137bbb545868c4cd63..5ee3435aa4fc9d29f345ecf551554faa7206928e 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -116,6 +116,8 @@ $(document).ready(function(){
          <a href="{% url teleforma-desk-period-course period.id course.id %}">{{ course.title }} - {{ type }}{% if course.description %} - {{ course.description }}{% endif %}</a>
         </div>
 
+        {% 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 dde0e9bd01dcd99a157cdc89e9a0a9f4e5ae9bd8..6bfa30e51d7e0cb6f735f493a3972e72432698ea 100644 (file)
--- 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