SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit 1780fd16 authored by Jean-Sébastien Caux's avatar Jean-Sébastien Caux
Browse files

Tweak pool submission details

parent 7ec28714
No related branches found
No related tags found
No related merge requests found
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
<div class="col-md-4"> <div class="col-md-4">
<a class="btn btn-success text-white" href="{% url 'submissions:pool:editorial_assignment' submission.preprint.identifier_w_vn_nr %}"><small>Volunteer as EiC</small></a> <a class="btn btn-success text-white" href="{% url 'submissions:pool:editorial_assignment' submission.preprint.identifier_w_vn_nr %}"><small>Volunteer as EiC</small></a>
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
...@@ -105,6 +106,14 @@ ...@@ -105,6 +106,14 @@
</a></li> </a></li>
{% endif %} {% endif %}
</ul> </ul>
{% if submission.cycle.has_required_actions %}
<li>
<button class="btn btn-sm btn-danger text-white">
Required actions
</button>
{% if request.user.contributor.is_ed_admin %}{% include 'submissions/pool/_required_actions_tooltip.html' with submission=submission classes='text-white' %}{% endif %}
</ul>
{% endif %}
</div> </div>
</div> </div>
...@@ -117,14 +126,6 @@ ...@@ -117,14 +126,6 @@
</div> </div>
{% endif %} {% endif %}
{% if submission.cycle.has_required_actions %}
<div class="card-text bg-danger text-white mt-1 py-1 px-2">
<button type="button" class="btn p-0" disabled>
<small class="text-white">This Submission contains required actions.</small>
</button>
{% if request.user.contributor.is_ed_admin %}{% include 'submissions/pool/_required_actions_tooltip.html' with submission=submission classes='text-white' %}{% endif %}
</div>
{% endif %}
{% if submission.status == 'seeking_assignment' %} {% if submission.status == 'seeking_assignment' %}
{% get_editor_invitations submission request.user as invitations %} {% get_editor_invitations submission request.user as invitations %}
......
...@@ -18,8 +18,33 @@ urlpatterns = [ # building on /submissions/pool/ ...@@ -18,8 +18,33 @@ urlpatterns = [ # building on /submissions/pool/
), ),
path( # <identifier>/ path( # <identifier>/
"<identifier:identifier_w_vn_nr>/", "<identifier:identifier_w_vn_nr>/",
views_pool.pool, include([
name="pool", path(
"",
views_pool.pool,
name="pool",
),
path(
"add_remark",
views_pool.add_remark,
name="add_remark",
),
path(
"editorial_assignment/",
include([
path(
"",
views_pool.editorial_assignment,
name="editorial_assignment",
),
path(
"<int:assignment_id>/",
views_pool.editorial_assignment,
name="editorial_assignment",
),
]),
),
])
), ),
path( path(
"submissions/", "submissions/",
...@@ -36,30 +61,10 @@ urlpatterns = [ # building on /submissions/pool/ ...@@ -36,30 +61,10 @@ urlpatterns = [ # building on /submissions/pool/
), ),
]), ]),
), ),
path(
"add_remark/<identifier:identifier_w_vn_nr>",
views_pool.add_remark,
name="add_remark",
),
# Assignment of Editor-in-charge # Assignment of Editor-in-charge
path( path(
"assignment_request/<int:assignment_id>", "assignment_request/<int:assignment_id>",
views_pool.assignment_request, views_pool.assignment_request,
name="assignment_request", name="assignment_request",
), ),
path(
"pool/<identifier:identifier_w_vn_nr>/editorial_assignment/",
include([
path(
"",
views_pool.editorial_assignment,
name="editorial_assignment",
),
path(
"<int:assignment_id>/",
views_pool.editorial_assignment,
name="editorial_assignment",
),
]),
),
] ]
...@@ -16,13 +16,16 @@ from colleges.permissions import ( ...@@ -16,13 +16,16 @@ from colleges.permissions import (
fellowship_required, fellowship_required,
fellowship_or_admin_required, fellowship_or_admin_required,
) )
from mails.utils import DirectMailUtil
from submissions.models import ( from submissions.models import (
EditorialAssignment, EditorialAssignment,
EICRecommendation, EICRecommendation,
Submission, Submission,
) )
from submissions.forms import SubmissionPoolSearchForm from submissions.forms import (
SubmissionPoolSearchForm,
EditorialAssignmentForm,
)
from submissions.utils import SubmissionUtils from submissions.utils import SubmissionUtils
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment