#2737 exclude archived articles from pre-reg article page.

openlibhums · Jun 16, 2022 · 9f40f15 · 9f40f15
1 parent 5a5e2bc
commit 9f40f15
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/journal/views.py b/src/journal/views.py
@@ -415,7 +415,11 @@ def article(request, identifier_type, identifier):
     :param identifier: the identifier
     :return: a rendered template of the article
     """
-    article_object = submission_models.Article.get_article(request.journal, identifier_type, identifier)
+    article_object = submission_models.Article.get_article(
+        request.journal,
+        identifier_type,
+        identifier,
+    )
 
     content, tables_in_galley = None, None
     galleys = article_object.galley_set.filter(public=True)

diff --git a/src/submission/models.py b/src/submission/models.py
@@ -1018,11 +1018,20 @@ def get_article(journal, identifier_type, identifier):
             # resolve an article from an identifier type and an identifier
             if identifier_type.lower() == 'id':
                 # this is the hardcoded fallback type: using built-in id
-                article = Article.objects.filter(id=identifier, journal=journal)[0]
+                article = Article.objects.filter(
+                    id=identifier,
+                    journal=journal,
+                ).exclude(
+                    stage=STAGE_ARCHIVED,
+                )[0]
             else:
                 # this looks up an article by an ID type and an identifier string
                 article = identifier_models.Identifier.objects.filter(
-                    id_type=identifier_type, identifier=identifier)[0].article
+                    id_type=identifier_type,
+                    identifier=identifier,
+                ).exclude(
+                    article__stage=STAGE_ARCHIVED,
+                )[0].article
 
                 if not article.journal == journal:
                     return None