From 53a00c405b2af13617c1460efaa850778daad3a6 Mon Sep 17 00:00:00 2001
From: sandeepsajan0 <sandeepsajan0@gmail.com>
Date: Wed, 11 May 2022 08:42:15 +0530
Subject: [PATCH] Pass block ids for determination and message blocks only

---
 hypha/apply/determinations/views.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hypha/apply/determinations/views.py b/hypha/apply/determinations/views.py
index b23a73333..acd32c39a 100644
--- a/hypha/apply/determinations/views.py
+++ b/hypha/apply/determinations/views.py
@@ -24,7 +24,7 @@ from hypha.apply.stream_forms.models import BaseStreamForm
 from hypha.apply.users.decorators import staff_required
 from hypha.apply.utils.views import CreateOrUpdateView, ViewDispatcher
 
-from .blocks import DeterminationBlock
+from .blocks import DeterminationBlock, DeterminationMessageBlock
 from .forms import (
     BatchConceptDeterminationForm,
     BatchDeterminationForm,
@@ -308,10 +308,13 @@ class DeterminationCreateOrUpdateView(BaseStreamForm, CreateOrUpdateView):
         site = Site.find_for_request(self.request)
         determination_messages = DeterminationMessageSettings.for_site(site)
 
+        # Pass blocks ids to identify block types(determination & message) in determination message template js.
         field_blocks_ids = {}
         if self.submission.is_determination_form_attached:
             for field_block in self.get_defined_fields():
-                field_blocks_ids[field_block.block_type] = field_block.id
+                if isinstance(field_block.block, DeterminationBlock) or \
+                        isinstance(field_block.block, DeterminationMessageBlock):
+                    field_blocks_ids[field_block.block_type] = field_block.id
 
         return super().get_context_data(
             submission=self.submission,
-- 
GitLab