COMCL-707: Fix case type category terms

compucorp · Sep 4, 2024 · 2ff0941 · 2ff0941
1 parent 949cc84
commit 2ff0941
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 37 deletions.
diff --git a/CRM/Civicase/Event/Listener/AssetBuilder.php b/CRM/Civicase/Event/Listener/AssetBuilder.php
@@ -16,7 +16,7 @@ class CRM_Civicase_Event_Listener_AssetBuilder {
    */
   public static function addWordReplacements(GenericHookEvent $event) {
     if ($event->asset == 'angular-modules.json') {
-      $caseCategoryName = \Civi::cache('metadata')->get('current_case_category');
+      $caseCategoryName = CRM_Core_Session::singleton()->get('current_case_category');
       CRM_Civicase_Hook_Helper_CaseTypeCategory::addWordReplacements($caseCategoryName);
 
       // Rebuild the asset if it has been built.

diff --git a/CRM/Civicase/Hook/Helper/CaseTypeCategory.php b/CRM/Civicase/Hook/Helper/CaseTypeCategory.php
@@ -69,7 +69,7 @@ public static function addWordReplacements($caseCategoryName) {
     }
 
     CRM_Core_Resources::singleton()->flushStrings()->resetCacheCode();
-    \Civi::cache('metadata')->set('current_case_category', $caseCategoryName);
+    CRM_Core_Session::singleton()->set('current_case_category', $caseCategoryName);
     $wordReplacements = CaseCategoryHelper::getWordReplacements($caseCategoryName);
     if (empty($wordReplacements)) {
       return;

diff --git a/CRM/Civicase/Hook/PageRun/AddCaseTypeCategoryToCache.php b/CRM/Civicase/Hook/PageRun/AddCaseTypeCategoryToCache.php
diff --git a/CRM/Civicase/Settings.php b/CRM/Civicase/Settings.php
@@ -1,12 +1,12 @@
 <?php
 
-use Civi\CCase\Utils as Utils;
 use CRM_Civicase_Helper_CaseUrl as CaseUrlHelper;
 use CRM_Civicase_Helper_NewCaseWebform as NewCaseWebform;
 use CRM_Civicase_Helper_OptionValues as OptionValuesHelper;
 use CRM_Civicase_Hook_Permissions_ExportCasesAndReports as ExportCasesAndReports;
 use CRM_Civicase_Service_CaseCategoryCustomFieldsSetting as CaseCategoryCustomFieldsSetting;
 use CRM_Civicase_Service_CaseCategoryPermission as CaseCategoryPermission;
+use Civi\CCase\Utils as Utils;
 
 /**
  * Get a list of settings for angular pages.
@@ -28,6 +28,7 @@ public static function getAll(): array {
 
     [$caseCategoryId, $caseCategoryName] = CaseUrlHelper::getCategoryParamsFromUrl();
 
+    CRM_Civicase_Hook_Helper_CaseTypeCategory::addWordReplacements($caseCategoryName);
     $permissionService = new CaseCategoryPermission();
     $caseCategoryPermissions = $permissionService->get($caseCategoryName);
     $caseCategorySetting = new CRM_Civicase_Service_CaseCategorySetting();

diff --git a/civicase.php b/civicase.php
@@ -415,7 +415,6 @@ function civicase_civicrm_pageRun(&$page) {
     new CRM_Civicase_Hook_PageRun_AddCaseAngularPageResources(),
     new CRM_Civicase_Hook_PageRun_AddContactPageSummaryResources(),
     new CRM_Civicase_Hook_PageRun_CaseCategoryCustomGroupListing(),
-    new CRM_Civicase_Hook_PageRun_AddCaseTypeCategoryToCache(),
   ];
 
   foreach ($hooks as $hook) {