From be77c2d396253bb5f8fcb2224c4003af4dc27541 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Mon, 22 Jan 2018 13:22:50 +0100
Subject: [PATCH] Edit query

---
 comments/models.py    | 4 +++-
 submissions/models.py | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/comments/models.py b/comments/models.py
index 8da7a23c3..9d34800d6 100644
--- a/comments/models.py
+++ b/comments/models.py
@@ -199,11 +199,13 @@ class Comment(TimeStampedModel):
         """
         # Import here due to circular import errors
         from submissions.models import Submission
+        from journals.models import Publication
         from commentaries.models import Commentary
 
         to_object = self.core_content_object
         if isinstance(to_object, Submission):
-            publication = to_object.publication
+            publication = Publication.objects.filter(
+                accepted_submission__arxiv_identifier_wo_vn_nr=to_object.arxiv_identifier_wo_vn_nr)
             if publication:
                 relation = {
                     'isReviewOfDOI': publication.doi_string,
diff --git a/submissions/models.py b/submissions/models.py
index 918080918..0988194d7 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -509,7 +509,8 @@ class Report(SubmissionRelatedObjectMixin, models.Model):
         If it is, return a dict with info on relation to the published object,
         based on Crossref's peer review content type.
         """
-        publication = self.submission.publication
+        publication = Publication.objects.filter(
+            accepted_submission__arxiv_identifier_wo_vn_nr=self.submission.arxiv_identifier_wo_vn_nr)
         if publication:
             relation = {
                 'isReviewOfDOI': publication.doi_string,
-- 
GitLab