Merge branch 'master' into dev_JSC_20210619_apimail_bsv_to_bs5

scipost_django/scipost/templatetags/scipost_extras.py

@@ -67,19 +67,3 @@ def is_in_group(user, group_name):
 def associated_contributors(draft):
     return Contributor.objects.filter(
         user__last_name__icontains=draft.last_name).order_by('user__last_name')
-
-
-def is_modulo(counter, total, modulo):
-    q = max(1, int(total / modulo))
-    counter -= 1
-    return (counter % q) == (q - 1)
-
-
-@register.filter(name='is_modulo_one_half')
-def is_modulo_one_half(counter, total):
-    return is_modulo(counter, total, 2)
-
-
-@register.filter(name='is_modulo_one_third')
-def is_modulo_one_third(counter, total):
-    return is_modulo(counter, total, 3)

scipost_django/submissions/templates/submissions/_submission_editorial_information.html

@@ -5,7 +5,7 @@
 {% is_ed_admin request.user as is_ed_admin %}
 
 <h3 class="highlight">
-  Editorial information &emsp;<button type="button" class="btn btn-primary px-1 py-0" data-toggle="toggle" data-bs-target="#editorialinformation"><small>Show/hide</small></button>
+  Editorial information &emsp;<button type="button" class="btn btn-primary px-1 py-0" data-bs-toggle="toggle" data-bs-target="#editorialinformation"><small>Show/hide</small></button>
 </h3>
 
 <div id="editorialinformation" class="mt-2" style="display:none;">

scipost_django/submissions/templates/submissions/submission_detail.html

 {% extends 'submissions/base.html' %}
 
 {% load scipost_extras %}
+{% load user_groups %}
 {% load submissions_extras %}
 {% load bootstrap %}
 {% load automarkup %}
@@ -25,6 +26,8 @@
 
 {% block content %}
 
+  {% is_ed_admin request.user as is_ed_admin %}
+
   <div class="row">
     {% if is_author_unchecked %}
       <div class="col-12">
@@ -151,7 +154,7 @@
 
   {% if is_author %}
     {% include 'submissions/_submission_author_information.html' with submission=submission %}
-  {% elif can_read_editorial_information %}
+  {% elif is_ed_admin or can_read_editorial_information %}
     {% include 'submissions/_submission_editorial_information.html' with submission=submission %}
   {% endif %}