diff --git a/src/journal/models.py b/src/journal/models.py index 38728d2767..18d895fc52 100755 --- a/src/journal/models.py +++ b/src/journal/models.py @@ -595,7 +595,10 @@ def get_sorted_articles(self): issue=Value(self.pk), ).values_list("order") - issue_articles = self.articles.all().prefetch_related( + issue_articles = self.articles.filter( + stage=submission_models.STAGE_PUBLISHED, + date_published__lte=timezone.now(), + ).prefetch_related( 'authors', 'frozenauthor_set', 'manuscript_files', ).select_related( diff --git a/src/journal/views.py b/src/journal/views.py index db269ebe97..add1dca870 100755 --- a/src/journal/views.py +++ b/src/journal/views.py @@ -1113,7 +1113,11 @@ def issue_add_article(request, issue_id): """ issue = get_object_or_404(models.Issue, pk=issue_id, journal=request.journal) - articles = submission_models.Article.objects.filter(journal=request.journal).exclude(pk__in=issue.article_pks) + articles = submission_models.Article.objects.filter( + journal=request.journal, + ).exclude( + Q(pk__in=issue.article_pks) | Q(stage=submission_models.STAGE_REJECTED) + ) if request.POST.get('article'): article_id = request.POST.get('article')