From fa5e2251856bf9ab0040b86c69db728fd3ca1aa0 Mon Sep 17 00:00:00 2001 From: "J.-S. Caux" <J.S.Caux@uva.nl> Date: Mon, 28 Nov 2016 05:37:47 +0100 Subject: [PATCH] Make paper_nr unique per volume (not per issue) --- journals/views.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/journals/views.py b/journals/views.py index 552db0e5e..98d221daf 100644 --- a/journals/views.py +++ b/journals/views.py @@ -204,9 +204,12 @@ def initiate_publication(request): current_issue = get_object_or_404(Issue, pk=initiate_publication_form.cleaned_data['to_be_issued_in'].id) # Determine next available paper number: - papers_in_current_issue = Publication.objects.filter(in_issue=current_issue) + #papers_in_current_issue = Publication.objects.filter(in_issue=current_issue) + papers_in_current_volume = Publication.objects.filter( + in_issue__in_volume=current_issue.in_volume) paper_nr = 1 - while papers_in_current_issue.filter(paper_nr=paper_nr).exists(): + #while papers_in_current_issue.filter(paper_nr=paper_nr).exists(): + while papers_in_current_volume.filter(paper_nr=paper_nr).exists(): paper_nr += 1 if paper_nr > 999: raise PaperNumberingError(paper_nr) -- GitLab