From d20098ab2eaad79d75d79e66849de97c7aab5f4c Mon Sep 17 00:00:00 2001
From: Kurund Jalmi <kurundjalmi@thirdsectordesign.org>
Date: Wed, 24 Nov 2021 16:00:14 +0000
Subject: [PATCH] Update Fields.tpl

---
 templates/CRM/UF/Form/Fields.tpl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/templates/CRM/UF/Form/Fields.tpl b/templates/CRM/UF/Form/Fields.tpl
index 1370f593c5..3492371194 100644
--- a/templates/CRM/UF/Form/Fields.tpl
+++ b/templates/CRM/UF/Form/Fields.tpl
@@ -6,8 +6,10 @@
   {assign var=profileFieldName value=$field.name}
   {if $prefix}
     {assign var="formElement" value=$form.$prefix.$profileFieldName}
+    {assign var="rowIdentifier" value=$form.$prefix.$profileFieldName.id}
   {else}
     {assign var="formElement" value=$form.$profileFieldName}
+    {assign var="rowIdentifier" value=$field.name}
   {/if}
 
   {if $field.groupTitle != $fieldset}
@@ -41,12 +43,12 @@
   {elseif $profileFieldName}
     {* Show explanatory text for field if not in 'view' or 'preview' modes *}
     {if $field.help_pre && $action neq 4 && $action neq 1028}
-      <div class="crm-section helprow-{$profileFieldName}-section helprow-pre" id="helprow-{$profileFieldName}">
+      <div class="crm-section helprow-{$profileFieldName}-section helprow-pre" id="helprow-{$rowIdentifier}">
         <div class="content description">{$field.help_pre}</div>
       </div>
     {/if}
     {if $field.options_per_line != 0}
-      <div class="crm-section editrow_{$profileFieldName}-section form-item" id="editrow-{$profileFieldName}">
+      <div class="crm-section editrow_{$profileFieldName}-section form-item" id="editrow-{$rowIdentifier}">
         <div class="label option-label">{$formElement.label}</div>
         <div class="content 3">
 
@@ -77,7 +79,7 @@
         <div class="clear"></div>
       </div>
     {else}
-      <div class="crm-section editrow_{$profileFieldName}-section form-item" id="editrow-{$profileFieldName}">
+      <div class="crm-section editrow_{$profileFieldName}-section form-item" id="editrow-{$rowIdentifier}">
         <div class="label">
           {$formElement.label}
         </div>
@@ -134,7 +136,7 @@
     {/if}
     {* Show explanatory text for field if not in 'view' or 'preview' modes *}
     {if $field.help_post && $action neq 4 && $action neq 1028}
-      <div class="crm-section helprow-{$profileFieldName}-section helprow-post" id="helprow-{$profileFieldName}">
+      <div class="crm-section helprow-{$profileFieldName}-section helprow-post" id="helprow-{$rowIdentifier}">
         <div class="content description">{$field.help_post}</div>
       </div>
     {/if}
-- 
2.25.1