diff --git a/scipost_django/scipost/templatetags/scipost_extras.py b/scipost_django/scipost/templatetags/scipost_extras.py index 1564e91f0887e9f0eac60e73255e3f6196b3bee4..f5ab4569ad37d662c82f2104a747a8dcdd64000e 100644 --- a/scipost_django/scipost/templatetags/scipost_extras.py +++ b/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) diff --git a/scipost_django/submissions/templates/submissions/_submission_editorial_information.html b/scipost_django/submissions/templates/submissions/_submission_editorial_information.html index bfbfec5b4d87e3b3dfd2db80f2b48960af8ba4b0..f3bf20c0a401c899bc601673dee2fad76f442574 100644 --- a/scipost_django/submissions/templates/submissions/_submission_editorial_information.html +++ b/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  <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  <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;"> diff --git a/scipost_django/submissions/templates/submissions/submission_detail.html b/scipost_django/submissions/templates/submissions/submission_detail.html index 7ee9682ff5a91655f3a7c26ed872ab5d3736cf1b..11985656101e9c7ba9b2c7fc90fe4b9c116c3e83 100644 --- a/scipost_django/submissions/templates/submissions/submission_detail.html +++ b/scipost_django/submissions/templates/submissions/submission_detail.html @@ -1,6 +1,7 @@ {% 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 %}