#4256 updates views with journal filters.

src/copyediting/views.py

@@ -38,8 +38,10 @@ def copyediting(request):
     :return: a contextualised template
     """
 
-    articles_in_copyediting = submission_models.Article.objects.filter(stage__in=submission_models.COPYEDITING_STAGES,
-                                                                       journal=request.journal)
+    articles_in_copyediting = submission_models.Article.objects.filter(
+        stage__in=submission_models.COPYEDITING_STAGES,
+        journal=request.journal,
+    )
 
     if not request.user.is_editor(request) and request.user.is_section_editor(request):
         articles_in_copyediting = core_logic.filter_articles_to_editor_assigned(
@@ -64,7 +66,11 @@ def article_copyediting(request, article_id):
     :return: a contextualised template
     """
 
-    article = get_object_or_404(submission_models.Article, pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     copyeditor_assignments = models.CopyeditAssignment.objects.filter(
         article=article,
     )
@@ -128,7 +134,11 @@ def add_copyeditor_assignment(request, article_id):
     :param article_id: a submission.models.Article PK
     :return: HttpRequest object
     """
-    article = get_object_or_404(submission_models.Article, pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     copyeditors = logic.get_copyeditors(article)
     copyeditor_pks = [copyeditor.user.pk for copyeditor in copyeditors]
     files = article.manuscript_files.all() | article.data_figure_files.all()
@@ -181,7 +191,11 @@ def notify_copyeditor_assignment(request, article_id, copyedit_id):
     :param copyedit_id: a CopyeditAssignment PK
     :return: HttpRequest object
     """
-    article = get_object_or_404(submission_models.Article, pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     copyedit = get_object_or_404(models.CopyeditAssignment, pk=copyedit_id)
     email_context = logic.get_copyeditor_notification_context(
         request, article, copyedit,
@@ -234,7 +248,11 @@ def edit_assignment(request, article_id, copyedit_id):
     :param copyedit_id: a CopyeditAssignment PK
     :return:
     """
-    article = get_object_or_404(submission_models.Article, pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     copyedit = get_object_or_404(models.CopyeditAssignment, pk=copyedit_id)
 
     if copyedit.decision:

src/core/views.py

@@ -741,7 +741,11 @@ def dashboard_article(request, article_id):
     :param article_id: int, Article object primary key
     :return: HttpResponse object
     """
-    article = get_object_or_404(submission_models.Article, pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
 
     template = 'core/article.html'
     context = {

src/journal/views.py

@@ -805,7 +805,11 @@ def submit_files_info(request, article_id, file_id):
     :param file_id: the file ID for which to submit information
     :return: a rendered template to submit file information
     """
-    article_object = get_object_or_404(submission_models.Article, pk=article_id)
+    article_object = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     file_object = get_object_or_404(core_models.File, pk=file_id)
 
     form = review_forms.ReplacementFileDetails(instance=file_object)
@@ -841,7 +845,11 @@ def file_history(request, article_id, file_id):
     if request.POST:
         return redirect(request.GET['return'])
 
-    article_object = get_object_or_404(submission_models.Article, pk=article_id)
+    article_object = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     file_object = get_object_or_404(core_models.File, pk=file_id)
 
     template = "journal/file_history.html"
@@ -882,7 +890,11 @@ def file_delete(request, article_id, file_id):
     :param file_id: the file ID for which to view the history
     :return: a redirect to the URL at the GET parameter 'return'
     """
-    article_object = get_object_or_404(submission_models.Article, pk=article_id)
+    article_object = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     file_object = get_object_or_404(core_models.File, pk=file_id)
 
     file_object.delete()
@@ -900,7 +912,11 @@ def article_file_make_galley(request, article_id, file_id):
     :param file_id: the file ID for which to view the history
     :return: a redirect to the URL at the GET parameter 'return'
     """
-    article_object = get_object_or_404(submission_models.Article, pk=article_id)
+    article_object = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     janeway_file = get_object_or_404(core_models.File, pk=file_id)
     blob = janeway_file.get_file(article_object, as_bytes=True)
     content_file = ContentFile(blob)
@@ -969,6 +985,7 @@ def article_figure(request, article_id, galley_id, file_name):
     figure_article = get_object_or_404(
         submission_models.Article,
         pk=article_id,
+        journal=request.journal,
     )
     galley = get_object_or_404(
         core_models.Galley,
@@ -1233,10 +1250,13 @@ def publish_article_check(request, article_id):
     :param article_id: Artcle object PK
     :return: HttpResponse object
     """
-    article = get_object_or_404(submission_models.Article,
-                                Q(stage=submission_models.STAGE_READY_FOR_PUBLICATION) |
-                                Q(stage=submission_models.STAGE_PUBLISHED),
-                                pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        Q(stage=submission_models.STAGE_READY_FOR_PUBLICATION) |
+        Q(stage=submission_models.STAGE_PUBLISHED),
+        pk=article_id,
+        journal=request.journal,
+    )
 
     task_type = request.POST.get('task_type')
     id = request.POST.get('id')
@@ -1759,7 +1779,11 @@ def manage_archive_article(request, article_id):
     from identifiers import models as identifier_models
     from submission import forms as submission_forms
 
-    article = get_object_or_404(submission_models.Article, pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     galleys = production_logic.get_all_galleys(article)
     identifiers = identifier_models.Identifier.objects.filter(article=article)
     galley_form = production_forms.GalleyForm()
@@ -2177,7 +2201,11 @@ def manage_article_log(request, article_id):
     :param article_id: Article object PK
     :return: HttpResponse object
     """
-    article = get_object_or_404(submission_models.Article, pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     content_type = ContentType.objects.get_for_model(article)
     log_entries = utils_models.LogEntry.objects.filter(content_type=content_type, object_id=article.pk)
 
@@ -2197,7 +2225,11 @@ def manage_article_log(request, article_id):
 
 @editor_user_required
 def resend_logged_email(request, article_id, log_id):
-    article = get_object_or_404(submission_models.Article, pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     log_entry = get_object_or_404(utils_models.LogEntry, pk=log_id)
     form = forms.ResendEmailForm(log_entry=log_entry)
     close = False
@@ -2234,7 +2266,8 @@ def send_user_email(request, user_id, article_id=None):
     if article_id:
         article = get_object_or_404(
             submission_models.Article,
-            pk=article_id
+            pk=article_id,
+            journal=request.journal,
         )
 
     if request.POST and 'send' in request.POST:
@@ -2271,7 +2304,11 @@ def new_note(request, article_id):
     :param article_id: Article object PK
     :return: HttpResponse object
     """
-    article = get_object_or_404(submission_models.Article, pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
 
     if request.POST:
 
@@ -2339,9 +2376,16 @@ def download_table(request, identifier_type, identifier, table_name):
 
 
 def download_supp_file(request, article_id, supp_file_id):
-    article = get_object_or_404(submission_models.Article, pk=article_id,
-                                stage=submission_models.STAGE_PUBLISHED)
-    supp_file = get_object_or_404(core_models.SupplementaryFile, pk=supp_file_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+        stage=submission_models.STAGE_PUBLISHED,
+    )
+    supp_file = get_object_or_404(
+        core_models.SupplementaryFile,
+        pk=supp_file_id,
+    )
 
     return files.serve_file(request, supp_file.file, article, public=True)
 
@@ -2361,7 +2405,11 @@ def texture_edit(request, file_id):
 
 @editor_user_required
 def document_management(request, article_id):
-    document_article = get_object_or_404(submission_models.Article, pk=article_id)
+    document_article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     article_files = core_models.File.objects.filter(article_id=document_article.pk)
     return_url = request.GET.get('return', '/dashboard/')
 

src/proofing/views.py

@@ -281,9 +281,11 @@ def edit_proofing_assignment(request, article_id, proofing_task_id):
     :param proofing_task_id: ProofingTask PK
     :return: HttpRedirect or HttpResponse
     """
-    article = get_object_or_404(submission_models.Article,
-                                pk=article_id,
-                                journal=request.journal)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     proofing_task = get_object_or_404(models.ProofingTask,
                                       pk=proofing_task_id)
 
@@ -384,7 +386,11 @@ def notify_proofreader(request, article_id, proofing_task_id):
     :param proofing_task_id: ProofingTask PK
     :return: HttpRedirect or HttpResponse
     """
-    article = get_object_or_404(submission_models.Article.objects.select_related('productionassignment'), pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article.objects.select_related('productionassignment'),
+        pk=article_id,
+        journal=request.journal,
+    )
     proofing_task = get_object_or_404(models.ProofingTask, pk=proofing_task_id)
     user_message_content = logic.get_notify_proofreader(request, article, proofing_task)
 
@@ -628,7 +634,11 @@ def notify_typesetter_changes(request, article_id, proofing_task_id, typeset_tas
     :param typeset_task_id: TypesetterProofingTask PK
     :return: HttpRedirect or HttpResponse
     """
-    article = get_object_or_404(submission_models.Article, pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     proofing_task = get_object_or_404(models.ProofingTask, pk=proofing_task_id)
     typeset_task = get_object_or_404(models.TypesetterProofingTask, pk=typeset_task_id)
     notification_email_content = logic.get_notify_typesetter(request, article, proofing_task, typeset_task)
@@ -717,7 +727,11 @@ def acknowledge(request, article_id, model_name, model_pk):
     :return: HttpRedirect or HttpResponse
     """
     model, model_object = logic.get_model_and_object(model_name, model_pk)
-    article = get_object_or_404(submission_models.Article, pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        pk=article_id,
+        journal=request.journal,
+    )
     text = logic.get_ack_message(request, article, model_name, model_object)
 
     if request.POST:
@@ -753,9 +767,12 @@ def complete_proofing(request, article_id):
     :param article_id: Article object PK
     :return: HttpResponse object
     """
-    article = get_object_or_404(submission_models.Article,
-                                stage=submission_models.STAGE_PROOFING,
-                                pk=article_id)
+    article = get_object_or_404(
+        submission_models.Article,
+        stage=submission_models.STAGE_PROOFING,
+        pk=article_id,
+        journal=request.journal,
+    )
     message = logic.get_complete_proofing_message(request, article)
 
     if request.POST: