Remove the tab selection inline script from TabHeader.tpl

This is part of ongoing cleanup to get the logic for selecting default tab
out of the tpl, which was redundant with the logic already in tabHeader.js.

diff --git a/CRM/Admin/Page/MessageTemplates.php b/CRM/Admin/Page/MessageTemplates.php
index 3363ac410fbcee74d488d90325dfa06622d78840..36d52d56b43ed1e9b6ab7ee54b2d27f8955f9932 100644 (file)
--- a/CRM/Admin/Page/MessageTemplates.php
+++ b/CRM/Admin/Page/MessageTemplates.php
@@ -274,6 +274,11 @@ class CRM_Admin_Page_MessageTemplates extends CRM_Core_Page_Basic {
     $this->assign('canEditSystemTemplates', CRM_Core_Permission::check('edit system workflow message templates'));
     $this->assign('canEditMessageTemplates', CRM_Core_Permission::check('edit message templates'));
     $this->assign('canEditUserDrivenMessageTemplates', CRM_Core_Permission::check('edit user-driven message templates'));
+    Civi::resources()
+      ->addScriptFile('civicrm', 'templates/CRM/common/TabHeader.js', 1, 'html-header')
+      ->addSetting([
+        'tabSettings' => ['active' => $_GET['selectedChild'] ?? NULL],
+      ]);
   }
 
 }

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index 8c49fee8a533511407818235bb95e764a185ea48..6d67ce875fe056495d8ad9523976baf73a865e5b 100644 (file)
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -2693,6 +2693,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
     if (!empty($selectedChild)) {
       $this->set('selectedChild', $selectedChild);
       $this->assign('selectedChild', $selectedChild);
+      Civi::resources()->addSetting(['tabSettings' => ['active' => $selectedChild]]);
     }
   }
 

diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl
index b60355dede5c249e9e019fda75ca156a4cd1332b..0adf34c5b1859e7b4e5cacc444bd1f9b22a660c2 100644 (file)
--- a/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -157,7 +157,6 @@
     {/foreach}
   </div>
 </div>
-{include file="CRM/common/TabHeader.tpl"}
 
 {elseif $action ne 1 and $action ne 2 and $action ne 4 and $action ne 8}
   <div class="messages status no-popup">

diff --git a/templates/CRM/common/TabHeader.tpl b/templates/CRM/common/TabHeader.tpl
index a10aa28ffa0b1c3531b10c169a1c3bc946098a50..1345f31f9a2a3cc1a1058f9a1899414a67d240ce 100644 (file)
--- a/templates/CRM/common/TabHeader.tpl
+++ b/templates/CRM/common/TabHeader.tpl
@@ -37,4 +37,3 @@
   {/if}
   <div class="clear"></div>
 </div> {* crm-content-block ends here *}
-{include file="CRM/common/TabSelected.tpl" defaultTab="settings"}

diff --git a/templates/CRM/common/TabSelected.tpl b/templates/CRM/common/TabSelected.tpl
index 2b32581b8528f4ff63cf20eb85b63ed3f990182f..573d5ae7c2b177d3f324993f913dfd12984c3f7a 100644 (file)
--- a/templates/CRM/common/TabSelected.tpl
+++ b/templates/CRM/common/TabSelected.tpl
@@ -1,3 +1,4 @@
+{* DEPRECATED script, should be refactored out and removed *}
 <script type='text/javascript'>
   var selectedTab = '{$defaultTab}';
   var tabContainer = '#mainTabContainer';

diff --git a/tests/phpunit/CRM/Contribute/Form/ContributionTest.php b/tests/phpunit/CRM/Contribute/Form/ContributionTest.php
index 3ab9be1c36013b005542c678be3f31819c56b5ca..42094065cbb474db7d950151b4742251c0de9775 100644 (file)
--- a/tests/phpunit/CRM/Contribute/Form/ContributionTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/ContributionTest.php
@@ -1773,7 +1773,7 @@ Price Field - Price Field 1        1   $ 100.00      $ 100.00
 
     // The page contents load later by ajax, so there's just the surrounding
     // html available now, but we can check at least one thing while we're here.
-    $this->assertStringContainsString("selectedTab = 'widget';", $contents);
+    $this->assertContains("mainTabContainer", $contents);
   }
 
 }