From: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Wed, 5 Aug 2015 13:18:18 +0000 (+0530)
Subject: CRM-16949 - Multi-record custom fields repeated when displayed for an individual
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3a51ef65cc7d0cc4bcfd0ef66da0e4c23df09e3a;p=civicrm-core.git

CRM-16949 - Multi-record custom fields repeated when displayed for an individual
---

diff --git a/templates/CRM/Contact/Page/View/CustomData.tpl b/templates/CRM/Contact/Page/View/CustomData.tpl
index 6cd6b78bb5..71d69300f0 100644
--- a/templates/CRM/Contact/Page/View/CustomData.tpl
+++ b/templates/CRM/Contact/Page/View/CustomData.tpl
@@ -25,6 +25,13 @@
 *}
 {* template for custom data *}
 {assign var="customDataGroupName" value=$customDataGroup.name}
+{strip}
+  {if $displayStyle neq 'tableOriented' and $action eq 16 or $action eq 4} {* Browse or View actions *}
+    <div class="form-item">
+      {include file="CRM/Custom/Page/CustomDataView.tpl"}
+    </div>
+  {/if}
+{/strip}
 {foreach from=$viewCustomData item=customGroupWrapper}
   {foreach from=$customGroupWrapper item=customGroup key=customGroupId}
     {assign var="customRegion" value='contact-custom-data-'|cat:$customGroup.name}
@@ -59,14 +66,6 @@
           </script>
         {/literal}
       {else}
-        {strip}
-          {if $action eq 16 or $action eq 4} {* Browse or View actions *}
-            <div class="form-item">
-              {include file="CRM/Custom/Page/CustomDataView.tpl"}
-            </div>
-          {/if}
-        {/strip}
-
         {if $mainEditForm}
           <script type="text/javascript">
             var showBlocks1 = new Array({$showBlocks1});