Merge pull request #12122 from eileenmcnaughton/cudat

tpl extraction of shared code for customDataBlock
civicrm · May 14, 2018 · f8f98c9 · f8f98c9
2 parents 6e74fca + 67bb649
commit f8f98c9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
@@ -206,21 +206,7 @@
             {$form.receipt_text.html|crmAddClass:huge}</td>
         </tr>
       </table>
-      <div id="customData"></div>
-      {*include custom data js file*}
-      {include file="CRM/common/customData.tpl"}
-      {literal}
-      <script type="text/javascript">
-      CRM.$(function($) {
-      {/literal}
-        CRM.buildCustomData( '{$customDataType}' );
-        {if $customDataSubType}
-          CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
-        {/if}
-        {literal}
-      });
-      </script>
-      {/literal}
+      {include file="CRM/common/customDataBlock.tpl"}
       {if $accessContribution and $action eq 2 and $rows.0.contribution_id}
         <div class="crm-accordion-wrapper">
           <div class="crm-accordion-header">{ts}Related Contributions{/ts}</div>

diff --git a/templates/CRM/common/customDataBlock.tpl b/templates/CRM/common/customDataBlock.tpl
@@ -0,0 +1,17 @@
+{if $customDataType}
+  <div id="customData"></div>
+  {*include custom data js file*}
+  {include file="CRM/common/customData.tpl"}
+  {literal}
+  <script type="text/javascript">
+    CRM.$(function($) {
+      {/literal}
+      CRM.buildCustomData( '{$customDataType}' );
+      {if $customDataSubType}
+      CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
+      {/if}
+      {literal}
+    });
+  </script>
+  {/literal}
+{/if}