From a8b4d1e56b0d728f74dd8fdd6f278f9cd68d9297 Mon Sep 17 00:00:00 2001
From: sks444 <krishnasingh.ss30@gmail.com>
Date: Mon, 19 Oct 2020 13:07:56 +0530
Subject: [PATCH] Fix apis to render no input field
---
hypha/apply/api/v1/determination/views.py | 3 +++
hypha/apply/api/v1/review/views.py | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/hypha/apply/api/v1/determination/views.py b/hypha/apply/api/v1/determination/views.py
index 51d82bc56..411933248 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 b7d189961..13898f3dd 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):
--
GitLab