Skip to content
Snippets Groups Projects
Commit 7816de6b authored by Fredrik Jonsson's avatar Fredrik Jonsson
Browse files

Allow current review forms with out the visability field to work.

parent 70877008
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@ from opentech.apply.review.options import NA
from opentech.apply.stream_forms.forms import StreamBaseForm
from .models import Review, ReviewOpinion
from .options import OPINION_CHOICES
from .options import OPINION_CHOICES, PRIVATE
class MixedMetaClass(type(StreamBaseForm), type(forms.ModelForm)):
......@@ -66,7 +66,12 @@ class ReviewModelForm(StreamBaseForm, forms.ModelForm, metaclass=MixedMetaClass)
self.instance.score = self.calculate_score(self.cleaned_data)
self.instance.recommendation = int(self.cleaned_data[self.instance.recommendation_field.id])
self.instance.is_draft = self.draft_button_name in self.data
self.instance.visibility = self.cleaned_data[self.instance.visibility_field.id]
# Old review forms do not have the requred visability field.
# This will set visibility to PRIVATE by default.
try:
self.instance.visibility = self.cleaned_data[self.instance.visibility_field.id]
except AttributeError:
self.instance.visibility = PRIVATE
self.instance.form_data = self.cleaned_data['form_data']
......
......@@ -117,9 +117,6 @@ class ReviewQuerySet(models.QuerySet):
def opinions(self):
return ReviewOpinion.objects.filter(review__id__in=self.values_list('id'))
def visible_to(self, user):
return self.filter(visibility__in=self.model.visibility_for(user))
class Review(ReviewFormFieldsMixin, BaseStreamForm, AccessFormData, models.Model):
submission = models.ForeignKey('funds.ApplicationSubmission', on_delete=models.CASCADE, related_name='reviews')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment