From 8e4d45d8213eb5843319f9e67005e7b45d8185f4 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Fri, 15 Sep 2017 20:34:34 +0200
Subject: [PATCH] Update EdCol Admin url structure
---
.../submissions/admin/submission_li.html | 5 +++
.../templates/submissions/admin/base.html | 13 ++++++
.../submissions/admin/editorial_admin.html | 42 ++++---------------
.../admin/eic_recommendation_detail.html | 3 +-
.../submissions/admin/plagiarism_report.html | 3 +-
submissions/urls.py | 2 +
submissions/views.py | 15 +++----
7 files changed, 39 insertions(+), 44 deletions(-)
create mode 100644 submissions/templates/partials/submissions/admin/submission_li.html
create mode 100644 submissions/templates/submissions/admin/base.html
diff --git a/submissions/templates/partials/submissions/admin/submission_li.html b/submissions/templates/partials/submissions/admin/submission_li.html
new file mode 100644
index 000000000..863ad5c59
--- /dev/null
+++ b/submissions/templates/partials/submissions/admin/submission_li.html
@@ -0,0 +1,5 @@
+<a href="{% url 'submissions:admin' submission.arxiv_identifier_w_vn_nr %}">{{submission.title}}</a>
+<div class="pl-md-4">
+ <em>by {{submission.author_list}}</em><br>
+ latest activity: {{submission.latest_activity|timesince}} ago
+</div>
diff --git a/submissions/templates/submissions/admin/base.html b/submissions/templates/submissions/admin/base.html
new file mode 100644
index 000000000..e238b581c
--- /dev/null
+++ b/submissions/templates/submissions/admin/base.html
@@ -0,0 +1,13 @@
+{% extends 'scipost/base.html' %}
+
+{% block breadcrumb %}
+ <nav class="breadcrumb py-md-2 px-0 hidden-sm-down">
+ <div class="container">
+ {% block breadcrumb_items %}
+ <a href="{% url 'submissions:admin' %}" class="breadcrumb-item">Editorial Administration</a>
+ {% endblock %}
+ </div>
+ </nav>
+{% endblock %}
+
+{% block container_class %}{{block.super}} pb-5{% endblock container_class %}
diff --git a/submissions/templates/submissions/admin/editorial_admin.html b/submissions/templates/submissions/admin/editorial_admin.html
index f4daca187..bd5d36b3d 100644
--- a/submissions/templates/submissions/admin/editorial_admin.html
+++ b/submissions/templates/submissions/admin/editorial_admin.html
@@ -1,10 +1,10 @@
-{% extends 'scipost/_personal_page_base.html' %}
+{% extends 'submissions/admin/base.html' %}
{% block pagetitle %}: Editorial Administration{% endblock pagetitle %}
{% block breadcrumb_items %}
- {{block.super}}
- <span class="breadcrumb-item">Editorial Administration</span>
+ {{ block.super }}
+ <span class="breadcrumb-item">{% if submission %}{{ submission.arxiv_identifier_w_vn_nr }}{% else %}All events in the last 24 hours{% endif %}</span>
{% endblock %}
@@ -27,18 +27,10 @@
{% include 'partials/submissions/admin/submission_tooltip.html' with submission=sub %}
{% if sub == submission %}
<strong>
- <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a>
- <div class="pl-md-4">
- <em>by {{sub.author_list}}</em><br>
- latest activity: {{sub.latest_activity|timesince}} ago
- </div>
+ {% include 'partials/submissions/admin/submission_li.html' with submission=sub %}
</strong>
{% else %}
- <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a>
- <div class="pl-md-4">
- <em>by {{sub.author_list}}</em><br>
- latest activity: {{sub.latest_activity|timesince}} ago
- </div>
+ {% include 'partials/submissions/admin/submission_li.html' with submission=sub %}
{% endif %}
</li>
{% empty %}
@@ -53,18 +45,10 @@
{% include 'partials/submissions/admin/submission_tooltip.html' with submission=sub %}
{% if sub == submission %}
<strong>
- <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a>
- <div class="pl-md-4">
- <em>by {{sub.author_list}}</em><br>
- latest activity: {{sub.latest_activity|timesince}} ago
- </div>
+ {% include 'partials/submissions/admin/submission_li.html' with submission=sub %}
</strong>
{% else %}
- <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a>
- <div class="pl-md-4">
- <em>by {{sub.author_list}}</em><br>
- latest activity: {{sub.latest_activity|timesince}} ago
- </div>
+ {% include 'partials/submissions/admin/submission_li.html' with submission=sub %}
{% endif %}
</li>
{% empty %}
@@ -79,18 +63,10 @@
{% include 'partials/submissions/admin/submission_tooltip.html' with submission=sub %}
{% if sub == submission %}
<strong>
- <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a>
- <div class="pl-md-4">
- <em>by {{sub.author_list}}</em><br>
- latest activity: {{sub.latest_activity|timesince}} ago
- </div>
+ {% include 'partials/submissions/admin/submission_li.html' with submission=sub %}
</strong>
{% else %}
- <a href="?submission={{sub.arxiv_identifier_w_vn_nr}}">{{sub.title}}</a>
- <div class="pl-md-4">
- <em>by {{sub.author_list}}</em><br>
- latest activity: {{sub.latest_activity|timesince}} ago
- </div>
+ {% include 'partials/submissions/admin/submission_li.html' with submission=sub %}
{% endif %}
</li>
{% empty %}
diff --git a/submissions/templates/submissions/admin/eic_recommendation_detail.html b/submissions/templates/submissions/admin/eic_recommendation_detail.html
index e453c3dc6..f23a39ca8 100644
--- a/submissions/templates/submissions/admin/eic_recommendation_detail.html
+++ b/submissions/templates/submissions/admin/eic_recommendation_detail.html
@@ -1,4 +1,4 @@
-{% extends 'submissions/_pool_base.html' %}
+{% extends 'submissions/admin/base.html' %}
{% block pagetitle %}: editorial recommendation for submission{% endblock pagetitle %}
@@ -7,7 +7,6 @@
{% block breadcrumb_items %}
{{block.super}}
- <a href="{% url 'submissions:admin' %}?submission={{submission.arxiv_identifier_w_vn_nr}}" class="breadcrumb-item">Editorial Administration</a>
<span class="breadcrumb-item">Editorial Recommendation</span>
{% endblock %}
diff --git a/submissions/templates/submissions/admin/plagiarism_report.html b/submissions/templates/submissions/admin/plagiarism_report.html
index 2b13c4fb6..8aa8d6f2d 100644
--- a/submissions/templates/submissions/admin/plagiarism_report.html
+++ b/submissions/templates/submissions/admin/plagiarism_report.html
@@ -1,4 +1,4 @@
-{% extends 'scipost/_personal_page_base.html' %}
+{% extends 'submissions/admin/base.html' %}
{% load bootstrap %}
@@ -6,7 +6,6 @@
{% block breadcrumb_items %}
{{block.super}}
- <a href="{% url 'submissions:admin' %}?submission={{submission.arxiv_identifier_w_vn_nr}}" class="breadcrumb-item">Editorial Administration</a>
<span class="breadcrumb-item">Plagiarism Report ({{ submission.arxiv_identifier_w_vn_nr }})</span>
{% endblock %}
diff --git a/submissions/urls.py b/submissions/urls.py
index c1f46c9ab..35a4f7d36 100644
--- a/submissions/urls.py
+++ b/submissions/urls.py
@@ -26,6 +26,8 @@ urlpatterns = [
# Editorial Administration
url(r'^admin$', views.EditorialSummaryView.as_view(), name='admin'),
+ url(r'^admin/{regex}$'.format(regex=SUBMISSIONS_COMPLETE_REGEX),
+ views.EditorialSummaryView.as_view(), name='admin'),
url(r'^admin/treated$', views.treated_submissions_list, name='treated_submissions_list'),
url(r'^admin/{regex}/reports/compile$'.format(regex=SUBMISSIONS_COMPLETE_REGEX),
views.treated_submission_pdf_compile, name='treated_submission_pdf_compile'),
diff --git a/submissions/views.py b/submissions/views.py
index 9ec89dceb..cc692d3d5 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -1469,13 +1469,14 @@ class EditorialSummaryView(SubmissionAdminViewMixin, ListView):
context = super().get_context_data(*args, **kwargs)
# Pick submission from `submission_list` to include proper filters such as author filters.
- try:
- arxiv_id = self.request.GET.get('submission')
- assert arxiv_id
- context['submission'] = (context['submission_list']
- .get(arxiv_identifier_w_vn_nr=arxiv_id))
- except (AssertionError, Submission.DoesNotExist):
- context['submission'] = None
+ if self.kwargs.get('arxiv_identifier_w_vn_nr'):
+ try:
+ context['submission'] = context['submission_list'].get(
+ arxiv_identifier_w_vn_nr=self.kwargs['arxiv_identifier_w_vn_nr'])
+ except Submission.DoesNotExist:
+ context['submission'] = None
+
+ if not context.get('submission'):
context['latest_events'] = SubmissionEvent.objects.for_eic().last_hours()
return context
--
GitLab