From 3e1c01b8694e5c0ff49174f1fcc03efaf598cd95 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Tue, 6 Mar 2018 19:07:13 +0100
Subject: [PATCH] Update Submission textual links to Publication
---
journals/search_indexes.py | 2 --
submissions/models.py | 4 +---
.../partials/submissions/submission_card_content.html | 2 +-
submissions/templates/submissions/submission_detail.html | 2 +-
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/journals/search_indexes.py b/journals/search_indexes.py
index 08c3b2898..89035e473 100644
--- a/journals/search_indexes.py
+++ b/journals/search_indexes.py
@@ -1,5 +1,3 @@
-# import datetime
-
from haystack import indexes
from .models import Publication
diff --git a/submissions/models.py b/submissions/models.py
index 61d1f8555..f9cdcfd6f 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -139,11 +139,9 @@ class Submission(models.Model):
header += ' (current version)'
else:
header += ' (deprecated version ' + str(self.arxiv_vn_nr) + ')'
- try:
+ if hasattr(self, 'publication') and self.publication.is_published:
header += ' (published as %s (%s))' % (
self.publication.doi_string, self.publication.publication_date.strftime('%Y'))
- except Publication.DoesNotExist:
- pass
return header
def touch(self):
diff --git a/submissions/templates/partials/submissions/submission_card_content.html b/submissions/templates/partials/submissions/submission_card_content.html
index aa9128c75..80ca856c5 100644
--- a/submissions/templates/partials/submissions/submission_card_content.html
+++ b/submissions/templates/partials/submissions/submission_card_content.html
@@ -4,7 +4,7 @@
<p class="text-muted mb-0">
Version {{ submission.arxiv_vn_nr }} ({% if submission.is_current %}current version{% else %}deprecated version {{ submission.arxiv_vn_nr }}{% endif %})
<br>
- {% if submission.publication %}
+ {% if submission.publication and submission.publication.is_published %}
Published as <a href="{{ submission.publication.get_absolute_url }}">{{ submission.publication.in_issue.in_volume.in_journal.get_abbreviation_citation }} <strong>{{ submission.publication.in_issue.in_volume.number }}</strong>, {{ submission.publication.get_paper_nr }} ({{ submission.publication.publication_date|date:'Y' }})</a>
{% else %}
Submitted {{ submission.submission_date }} to {{ submission.get_submitted_to_journal_display }}
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 0d6dd8007..fe0b693f8 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -26,7 +26,7 @@
<h3 class="mb-3">by {{submission.author_list}}</h3>
<div class="pl-2">
- {% if submission.publication %}
+ {% if submission.publication and submission.publication.is_published %}
<h3>- Published as <a href="{{submission.publication.get_absolute_url}}">{{submission.publication.in_issue.in_volume.in_journal.get_abbreviation_citation}} <strong>{{submission.publication.in_issue.in_volume.number}}</strong>, {{submission.publication.get_paper_nr}} ({{submission.publication.publication_date|date:'Y'}})</a></h3>
{% endif %}
--
GitLab