diff --git a/hypha/apply/api/v1/determination/views.py b/hypha/apply/api/v1/determination/views.py index 51d82bc56d3e7743bf86e15e215d80e92bc92ab3..411933248f936f1d754056cd99187ad633785fe6 100644 --- a/hypha/apply/api/v1/determination/views.py +++ b/hypha/apply/api/v1/determination/views.py @@ -8,6 +8,7 @@ from rest_framework.decorators import action from rest_framework.exceptions import ValidationError from rest_framework.response import Response from rest_framework_api_key.permissions import HasAPIKey +from wagtail.core.blocks.field_block import RichTextBlock from hypha.apply.activity.messaging import MESSAGES, messenger from hypha.apply.activity.models import Activity @@ -108,6 +109,8 @@ class SubmissionDeterminationViewSet( for field_block in field_blocks: if isinstance(field_block.block, DeterminationBlock): determination_data[field_block.id] = determination.outcome + if isinstance(field_block.block, RichTextBlock): + determination_data[field_block.id] = field_block.value.source determination_data['id'] = determination.id determination_data['is_draft'] = determination.is_draft return determination_data diff --git a/hypha/apply/api/v1/review/views.py b/hypha/apply/api/v1/review/views.py index b7d189961c04cbd5640f43b811ac150edc27844c..13898f3dd9bbe4adff3460aab212e509e73e3843 100644 --- a/hypha/apply/api/v1/review/views.py +++ b/hypha/apply/api/v1/review/views.py @@ -4,6 +4,7 @@ from rest_framework.decorators import action from rest_framework.exceptions import ValidationError from rest_framework.response import Response from rest_framework_api_key.permissions import HasAPIKey +from wagtail.core.blocks.field_block import RichTextBlock from hypha.apply.activity.messaging import MESSAGES, messenger from hypha.apply.funds.models import AssignedReviewers @@ -161,6 +162,9 @@ class SubmissionReviewViewSet( review_data['score'] = review.score review_data['opinions'] = review.opinions review_data['is_draft'] = review.is_draft + for field_block in review.form_fields: + if isinstance(field_block.block, RichTextBlock): + review_data[field_block.id] = field_block.value.source return review_data def retrieve(self, request, *args, **kwargs):