Merge pull request #27968 from demeritcowboy/case-tag-label

dev/core#4730 - Case tagsets showing name instead of label
civicrm · Oct 30, 2023 · 08e2ae6 · 08e2ae6
2 parents 7a71c21 + e7ddf00
commit 08e2ae6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CRM/Case/Form/CaseView.php b/CRM/Case/Form/CaseView.php
@@ -457,16 +457,16 @@ public function buildQuickForm() {
         'entity_table' => 'civicrm_case',
         'tag_id.parent_id.is_tagset' => 1,
         'options' => ['limit' => 0],
-        'return' => ["tag_id.parent_id", "tag_id.parent_id.name", "tag_id.name"],
+        'return' => ["tag_id.parent_id", "tag_id.parent_id.label", "tag_id.label"],
       ]);
       foreach ($tagSetItems['values'] as $tag) {
         $tagSetTags += [
           $tag['tag_id.parent_id'] => [
-            'name' => $tag['tag_id.parent_id.name'],
+            'label' => $tag['tag_id.parent_id.label'],
             'items' => [],
           ],
         ];
-        $tagSetTags[$tag['tag_id.parent_id']]['items'][] = $tag['tag_id.name'];
+        $tagSetTags[$tag['tag_id.parent_id']]['items'][] = $tag['tag_id.label'];
       }
     }
     $this->assign('tagSetTags', $tagSetTags);

diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl
@@ -304,8 +304,8 @@
 
    {foreach from=$tagSetTags item=displayTagset}
      <p class="crm-block crm-content-block crm-case-caseview-display-tagset">
-       &nbsp;&nbsp;<strong>{$displayTagset.name}:</strong>
-       {', '|implode:$displayTagset.items}
+       &nbsp;&nbsp;<strong>{$displayTagset.label}:</strong>
+       {', '|implode:$displayTagset.items|escape}
      </p>
    {/foreach}