diff --git a/opentech/apply/review/templatetags/review_tags.py b/opentech/apply/review/templatetags/review_tags.py index d4b5432390738e97bef43e7ac9108693bbaab44e..f5c2cfbf84f5e96c8ef05fdf17d20f81aa052c40 100644 --- a/opentech/apply/review/templatetags/review_tags.py +++ b/opentech/apply/review/templatetags/review_tags.py @@ -37,10 +37,12 @@ def traffic_light(value): def can_review(user, submission): return submission.can_review(user) + @register.filter def has_draft(user, submission): return submission.can_review(user) and submission.reviews.filter(author=user, is_draft=True).exists() + @register.filter def draft_url(user, submission): return reverse('apply:reviews:draft', args=(submission.id, submission.reviews.get(author=user, is_draft=True).id)) diff --git a/opentech/apply/review/views.py b/opentech/apply/review/views.py index b57f88aa73baf9b691401fac6a2d8fe721468540..9791d6edb82c388ca42632ee991055d9fdc51842 100644 --- a/opentech/apply/review/views.py +++ b/opentech/apply/review/views.py @@ -74,8 +74,8 @@ class ReviewDraftEditView(UpdateView): self.submission = get_object_or_404(ApplicationSubmission, id=self.kwargs['submission_pk']) if not self.get_object().is_draft \ - or not self.submission.phase.has_perm(request.user, 'review') \ - or not self.submission.has_permission_to_review(request.user): + or not self.submission.phase.has_perm(request.user, 'review') \ + or not self.submission.has_permission_to_review(request.user): raise PermissionDenied() if self.request.POST and self.submission.reviewed_by(request.user):