diff --git a/opentech/apply/funds/models.py b/opentech/apply/funds/models.py index 8213dc1fb3880e43799060aebc0b1ac89ede4802..5421f66f26878c22909d6840a84f81b703ebaec2 100644 --- a/opentech/apply/funds/models.py +++ b/opentech/apply/funds/models.py @@ -662,18 +662,18 @@ class ApplicationSubmission(WorkflowHelpers, BaseStreamForm, AbstractFormSubmiss @property def staff_not_reviewed(self): - return self.reviewers.staff().exclude(id__in=self.reviews.published().values('author')) + return self.reviewers.staff().exclude(id__in=self.reviews.submitted().values('author')) @property def reviewers_not_reviewed(self): return self.reviewers.reviewers().exclude( - id__in=self.reviews.published().values('author') + id__in=self.reviews.submitted().values('author') ).exclude( id__in=self.staff_not_reviewed, ) def reviewed_by(self, user): - return self.reviews.published().filter(author=user).exists() + return self.reviews.submitted().filter(author=user).exists() def has_permission_to_review(self, user): if user.is_apply_staff: diff --git a/opentech/apply/review/models.py b/opentech/apply/review/models.py index d64ecc5e43333c053004390506b8e7833708683a..1247fbeedfa20337c7c348cc40353abe30e9f0c3 100644 --- a/opentech/apply/review/models.py +++ b/opentech/apply/review/models.py @@ -20,14 +20,14 @@ RECOMMENDATION_CHOICES = ( class ReviewQuerySet(models.QuerySet): - def published(self): + def submitted(self): return self.filter(is_draft=False) def by_staff(self): - return self.published().filter(author__in=User.objects.staff()) + return self.submitted().filter(author__in=User.objects.staff()) def by_reviewers(self): - return self.published().filter(author__in=User.objects.reviewers()) + return self.submitted().filter(author__in=User.objects.reviewers()) def staff_score(self): return self.by_staff().score()