From ed464fabcb31dfb1843c541249bbef29c2cdc3e7 Mon Sep 17 00:00:00 2001
From: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Tue, 8 Nov 2016 15:24:03 +0530
Subject: [PATCH] CRM-19352: Fix pre-post help text on custom data

---
 .../CRM/Contact/Page/View/CustomData.tpl      |  7 +-
 templates/CRM/Custom/Page/CustomDataView.tpl  | 99 ++++++++++---------
 2 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/templates/CRM/Contact/Page/View/CustomData.tpl b/templates/CRM/Contact/Page/View/CustomData.tpl
index 0d8b7d655a..c48eacac9d 100644
--- a/templates/CRM/Contact/Page/View/CustomData.tpl
+++ b/templates/CRM/Contact/Page/View/CustomData.tpl
@@ -27,6 +27,7 @@
 {assign var="customDataGroupName" value=$customDataGroup.name}
 {strip}
   {if $displayStyle neq 'tableOriented' and ($action eq 16 or $action eq 4)} {* Browse or View actions *}
+    {assign var="customGroupDisplayDone" value=1}
     <div class="form-item">
       {include file="CRM/Custom/Page/CustomDataView.tpl"}
     </div>
@@ -63,11 +64,13 @@
     </script>
   {/literal}
 {/if}
+
+{* Todo: Comment on which part custom data gets displayed from the below code. *}
 {foreach from=$viewCustomData item=customGroupWrapper}
   {foreach from=$customGroupWrapper item=customGroup key=customGroupId}
     {assign var="customRegion" value='contact-custom-data-'|cat:$customGroup.name}
     {crmRegion name=$customRegion}
-      {if $customGroup.help_pre}
+      {if $customGroup.help_pre and !$customGroupDisplayDone}
         <div class="messages help">{$customGroup.help_pre}</div>
       {/if}
       {if $action eq 0 or $action eq 1 or $action eq 2 or $recordActivity}
@@ -89,7 +92,7 @@
           on_load_init_blocks(showBlocks, hideBlocks);
         </script>
       {/if}
-      {if $customGroup.help_post}
+      {if $customGroup.help_post and !$customGroupDisplayDone}
         <div class="messages help">{$customGroup.help_post}</div>
       {/if}
     {/crmRegion}
diff --git a/templates/CRM/Custom/Page/CustomDataView.tpl b/templates/CRM/Custom/Page/CustomDataView.tpl
index 8b0f9d3c7d..2877765a5a 100644
--- a/templates/CRM/Custom/Page/CustomDataView.tpl
+++ b/templates/CRM/Custom/Page/CustomDataView.tpl
@@ -28,7 +28,12 @@
 {assign var="rowCount" value=1}
 {foreach from=$viewCustomData item=customValues key=customGroupId}
   {foreach from=$customValues item=cd_edit key=cvID}
-{if $multiRecordDisplay neq 'single'}
+  {assign var="customRegion" value='contact-custom-data-'|cat:$cd_edit.name}
+  {crmRegion name=$customRegion}
+    {if $cd_edit.help_pre}
+      <div class="messages help">{$cd_edit.help_pre}</div>
+    {/if}
+    {if $multiRecordDisplay neq 'single'}
     <table class="no-border">
       {assign var='index' value=$groupId|cat:"_$cvID"}
       {if ($editOwnCustomData and $showEdit) or ($showEdit and $editCustomData and $groupId)}
@@ -107,55 +112,59 @@
         </td>
       </tr>
     </table>
-{else}
-   {foreach from=$cd_edit.fields item=element key=field_id}
-     <div class="crm-section">
-      {if $element.options_per_line != 0}
-          <div class="label">{$element.field_title}</div>
-          <div class="content">
-          {* sort by fails for option per line. Added a variable to iterate through the element array*}
-          {foreach from=$element.field_value item=val}
-             {$val}
-             <br/>
-          {/foreach}
-          </div>
-       {else}
-          <div class="label">{$element.field_title}</div>
-          {if $element.field_type == 'File'}
-            <div class="content">
-             {if $element.field_value}
-               {$element.field_value}
-             {else}
-               <br/>
-             {/if}
-            </div>
-          {else}
-            {if $element.field_data_type == 'Money'}
-              {if $element.field_type == 'Text'}
-                 <div class="content">{if $element.field_value}{$element.field_value|crmMoney}{else}<br/>{/if}</div>
-              {else}
-                 <div class="content">{if $element.field_value}{$element.field_value}{else}<br/>{/if}</div>
-              {/if}
-            {else}
+    {else}
+      {foreach from=$cd_edit.fields item=element key=field_id}
+        <div class="crm-section">
+          {if $element.options_per_line != 0}
+              <div class="label">{$element.field_title}</div>
               <div class="content">
-                {if $element.contact_ref_id}
-                  <a href='{crmURL p="civicrm/contact/view" q="reset=1&cid=`$element.contact_ref_id`"}'>
-                {/if}
-                {if $element.field_data_type == 'Memo'}
-                  {$element.field_value|nl2br}
+              {* sort by fails for option per line. Added a variable to iterate through the element array*}
+              {foreach from=$element.field_value item=val}
+                {$val}
+                <br/>
+              {/foreach}
+              </div>
+          {else}
+              <div class="label">{$element.field_title}</div>
+              {if $element.field_type == 'File'}
+                <div class="content">
+                {if $element.field_value}
+                  {$element.field_value}
                 {else}
-                  {if $element.field_value}{$element.field_value} {else}<br/>{/if}
+                  <br/>
                 {/if}
-                {if $element.contact_ref_id}
-                  </a>
+                </div>
+              {else}
+                {if $element.field_data_type == 'Money'}
+                  {if $element.field_type == 'Text'}
+                    <div class="content">{if $element.field_value}{$element.field_value|crmMoney}{else}<br/>{/if}</div>
+                  {else}
+                    <div class="content">{if $element.field_value}{$element.field_value}{else}<br/>{/if}</div>
+                  {/if}
+                {else}
+                  <div class="content">
+                    {if $element.contact_ref_id}
+                      <a href='{crmURL p="civicrm/contact/view" q="reset=1&cid=`$element.contact_ref_id`"}'>
+                    {/if}
+                    {if $element.field_data_type == 'Memo'}
+                      {$element.field_value|nl2br}
+                    {else}
+                      {if $element.field_value}{$element.field_value} {else}<br/>{/if}
+                    {/if}
+                    {if $element.contact_ref_id}
+                      </a>
+                    {/if}
+                  </div>
                 {/if}
-              </div>
+              {/if}
             {/if}
-          {/if}
-       {/if}
-     </div>
-   {/foreach}
-{/if}
+          </div>
+        {/foreach}
+      {/if}
+      {if $cd_edit.help_post}
+        <div class="messages help">{$cd_edit.help_post}</div>
+      {/if}
+    {/crmRegion}
   {/foreach}
 {/foreach}
 {*currently delete is available only for tab custom data*}
-- 
2.25.1