From 2ff8184d94e67c3113308184ba01dcad46204674 Mon Sep 17 00:00:00 2001
From: colemanw <coleman@civicrm.org>
Date: Fri, 8 Dec 2023 10:36:17 -0500
Subject: [PATCH] AdminUI - Fix labelFormat links

---
 ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.html | 10 +++++-----
 ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.php  |  1 -
 .../managed/SavedSearch_Label_Formats.mgd.php          |  8 ++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.html b/ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.html
index ddccba5e90..31b2548556 100644
--- a/ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.html
+++ b/ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.html
@@ -1,20 +1,20 @@
 <div class="help">
-  
+
   <div>{{:: ts('You can configure one or more Label Formats for your CiviCRM installation. Label Formats are used when creating mailing labels.')}}<br/>
 {{:: ts('You can change which fields are printed on each label in')}} <a href="/civicrm/admin/setting/preferences/address?reset=1">{{:: ts('Address Settings')}}</a>.</div>
 
 </div>
 <div crm-ui-tab-set="">
-  
+
   <div af-fieldset="" crm-ui-tab="" crm-title="ts('Mailing Labels')" id="tab-mailinglabels">
     <div class="af-markup">
       <crm-search-display-table search-name="Label_Formats" display-name="Label_Formats_Table_1" filters="{'option_group_id:name': 'label_format'}"/>
-    </div> 
+    </div>
   </div>
-  <div af-fieldset="" crm-ui-tab="" crm-title="ts('Name Badge')" id="tab-namebadge">
+  <div af-fieldset="" crm-ui-tab="" crm-title="ts('Name Badges')" id="tab-namebadge">
     <div class="af-markup">
       <crm-search-display-table search-name="Label_Formats" display-name="Label_Formats_Table_1" filters="{'option_group_id:name': 'name_badge'}"/>
-    </div> 
+    </div>
   </div>
 
 </div>
diff --git a/ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.php b/ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.php
index fda5b7c984..a84ce69cd2 100644
--- a/ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.php
+++ b/ext/civicrm_admin_ui/ang/afsearchLabelFormats.aff.php
@@ -9,5 +9,4 @@ return [
   'permission' => [
     'administer CiviCRM',
   ],
-  'modified_date' => '2023-12-07 22:54:39',
 ];
diff --git a/ext/civicrm_admin_ui/managed/SavedSearch_Label_Formats.mgd.php b/ext/civicrm_admin_ui/managed/SavedSearch_Label_Formats.mgd.php
index 755a9b3c9f..dc2ee01d35 100644
--- a/ext/civicrm_admin_ui/managed/SavedSearch_Label_Formats.mgd.php
+++ b/ext/civicrm_admin_ui/managed/SavedSearch_Label_Formats.mgd.php
@@ -5,7 +5,7 @@ return [
   [
     'name' => 'SavedSearch_Label_Formats',
     'entity' => 'SavedSearch',
-    'cleanup' => 'unused',
+    'cleanup' => 'always',
     'update' => 'unmodified',
     'params' => [
       'version' => 4,
@@ -46,7 +46,7 @@ return [
   [
     'name' => 'SavedSearch_Label_Formats_SearchDisplay_Label_Formats_Table_1',
     'entity' => 'SearchDisplay',
-    'cleanup' => 'unused',
+    'cleanup' => 'always',
     'update' => 'unmodified',
     'params' => [
       'version' => 4,
@@ -101,7 +101,7 @@ return [
               'type' => 'field',
               'key' => 'is_reserved',
               'dataType' => 'Boolean',
-              'label' => E::ts('Reserved?'),
+              'label' => E::ts('Reserved'),
               'sortable' => TRUE,
             ],
             [
@@ -163,7 +163,7 @@ return [
           'draggable' => 'weight',
           'toolbar' => [
             [
-              'path' => 'civicrm/admin/labelFormats/edit?action=add&id=[id]&group=[option_group_id:name]&reset=1',
+              'path' => 'civicrm/admin/labelFormats/edit?action=add&group=[option_group_id:name]&reset=1',
               'icon' => 'fa-plus',
               'text' => E::ts('Add'),
               'style' => 'default',
-- 
2.25.1