crmMailingAB - Only display "Headers and Footers" if there are header…

…s and footers
civicrm · Sep 18, 2019 · a93b3ae · a93b3ae
1 parent 988944e
commit a93b3ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/ang/crmMailingAB.js b/ang/crmMailingAB.js
@@ -32,6 +32,9 @@
         templateUrl: '~/crmMailingAB/EditCtrl/main.html',
         controller: 'CrmMailingABEditCtrl',
         resolve: {
+          mailingFields: function(crmMetadata) {
+            return crmMetadata.getFields('Mailing');
+          },
           abtest: function($route, CrmMailingAB) {
             var abtest = new CrmMailingAB($route.current.params.id == 'new' ? null : $route.current.params.id);
             return abtest.load();

diff --git a/ang/crmMailingAB/EditCtrl.js b/ang/crmMailingAB/EditCtrl.js
@@ -1,6 +1,6 @@
 (function(angular, $, _) {
 
-  angular.module('crmMailingAB').controller('CrmMailingABEditCtrl', function($scope, abtest, crmMailingABCriteria, crmMailingMgr, crmMailingPreviewMgr, crmStatus, $q, $location, crmBlocker, $interval, $timeout, CrmAutosaveCtrl, dialogService) {
+  angular.module('crmMailingAB').controller('CrmMailingABEditCtrl', function($scope, abtest, crmMailingABCriteria, crmMailingMgr, crmMailingPreviewMgr, crmStatus, $q, $location, crmBlocker, $interval, $timeout, CrmAutosaveCtrl, dialogService, mailingFields) {
     $scope.abtest = abtest;
     var ts = $scope.ts = CRM.ts(null);
     var block = $scope.block = crmBlocker();
@@ -9,6 +9,7 @@
     $scope.crmMailingABCriteria = crmMailingABCriteria;
     $scope.crmMailingConst = CRM.crmMailing;
     $scope.checkPerm = CRM.checkPerm;
+    $scope.mailingFields = mailingFields;
 
     $scope.isSubmitted = function isSubmitted() {
       return _.size(abtest.mailings.a.jobs) > 0 || _.size(abtest.mailings.b.jobs) > 0;

diff --git a/ang/crmMailingAB/EditCtrl/edit.html b/ang/crmMailingAB/EditCtrl/edit.html
@@ -63,7 +63,7 @@
             <div crm-attachments="abtest.attachments.a"></div>
           </div>
           -->
-          <div crm-ui-tab id="tab-header" crm-title="ts('Header and Footer')">
+          <div crm-ui-tab id="tab-header" crm-title="ts('Header and Footer')" ng-if="mailingFields.header_id.options.length > 0 || mailingFields.footer_id.options.length > 0">
             <div crm-mailing-block-header-footer crm-mailing="abtest.mailings.a"></div>
           </div>
           <div crm-ui-tab id="tab-pub" crm-title="ts('Publication')">
@@ -101,7 +101,7 @@
           <div crm-ui-tab id="tab-attachmentA" crm-title="ts('Attachments')">
             <div crm-attachments="abtest.attachments.a"></div>
           </div>
-          <div crm-ui-tab id="tab-headerA" crm-title="ts('Header and Footer')">
+          <div crm-ui-tab id="tab-headerA" crm-title="ts('Header and Footer')" ng-if="mailingFields.header_id.options.length > 0 || mailingFields.footer_id.options.length > 0">
             <div crm-mailing-block-header-footer crm-mailing="abtest.mailings.a"></div>
           </div>
           <div crm-ui-tab id="tab-pubA" crm-title="ts('Publication')">
@@ -136,7 +136,7 @@
           <div crm-ui-tab id="tab-attachmentB" crm-title="ts('Attachments')">
             <div crm-attachments="abtest.attachments.b"></div>
           </div>
-          <div crm-ui-tab id="tab-headerB" crm-title="ts('Header and Footer')">
+          <div crm-ui-tab id="tab-headerB" crm-title="ts('Header and Footer')" ng-if="mailingFields.header_id.options.length > 0 || mailingFields.footer_id.options.length > 0">
             <div crm-mailing-block-header-footer crm-mailing="abtest.mailings.b"></div>
           </div>
           <div crm-ui-tab id="tab-pubB" crm-title="ts('Publication')">