From a9116544199414d33499a33db5a8d3e644e8c6b6 Mon Sep 17 00:00:00 2001 From: Aidan Saunders Date: Wed, 6 Dec 2023 19:03:04 +0000 Subject: [PATCH] Updates to Label Format display --- .../ang/afsearchLabelFormat.aff.html | 2 + .../ang/afsearchLabelFormat.aff.php | 9 ++- .../managed/SavedSearch_label_format.mgd.php | 78 ++++++++----------- 3 files changed, 42 insertions(+), 47 deletions(-) diff --git a/ext/civicrm_search_ui/ang/afsearchLabelFormat.aff.html b/ext/civicrm_search_ui/ang/afsearchLabelFormat.aff.html index 179435de8c..e66ad29350 100644 --- a/ext/civicrm_search_ui/ang/afsearchLabelFormat.aff.html +++ b/ext/civicrm_search_ui/ang/afsearchLabelFormat.aff.html @@ -1,12 +1,14 @@
+
{{:: ts('You can configure one or more Label Formats for your CiviCRM installation. Label Formats are used when creating mailing labels.')}}
{{:: ts('You can change which fields are printed on each label in')}} {{:: ts('Address Settings')}}.
+
diff --git a/ext/civicrm_search_ui/ang/afsearchLabelFormat.aff.php b/ext/civicrm_search_ui/ang/afsearchLabelFormat.aff.php index 31058670f3..88742dfb1b 100644 --- a/ext/civicrm_search_ui/ang/afsearchLabelFormat.aff.php +++ b/ext/civicrm_search_ui/ang/afsearchLabelFormat.aff.php @@ -3,9 +3,12 @@ use CRM_CivicrmSearchUi_ExtensionUtil as E; return [ 'type' => 'search', - 'title' => E::ts('Label Format form'), - 'description' => E::ts('Label Format form'), + 'title' => E::ts('Label Formats'), + 'description' => E::ts('Label Formats'), 'icon' => 'fa-list-alt', 'server_route' => 'civicrm/searchkit_ui/admin/labelFormats', - 'modified_date' => '2023-12-05 04:11:31', + 'permission' => [ + 'administer CiviCRM', + ], + 'modified_date' => '2023-12-06 18:52:54', ]; diff --git a/ext/civicrm_search_ui/managed/SavedSearch_label_format.mgd.php b/ext/civicrm_search_ui/managed/SavedSearch_label_format.mgd.php index 3ca6e32d2f..0a225004fb 100644 --- a/ext/civicrm_search_ui/managed/SavedSearch_label_format.mgd.php +++ b/ext/civicrm_search_ui/managed/SavedSearch_label_format.mgd.php @@ -19,9 +19,9 @@ return [ 'OptionGroup_OptionValue_option_group_id_01.label', 'title', 'description', - 'is_active', 'is_reserved', 'OptionGroup_OptionValue_option_group_id_01.grouping', + 'OptionGroup_OptionValue_option_group_id_01.is_default', ], 'orderBy' => [], 'where' => [ @@ -70,7 +70,11 @@ return [ 'description' => '', 'sort' => [], 'limit' => 50, - 'pager' => [], + 'pager' => [ + 'show_count' => FALSE, + 'expose_limit' => FALSE, + 'hide_single' => TRUE, + ], 'placeholder' => 5, 'columns' => [ [ @@ -96,10 +100,22 @@ return [ ], [ 'type' => 'field', - 'key' => 'is_active', + 'key' => 'OptionGroup_OptionValue_option_group_id_01.is_default', 'dataType' => 'Boolean', - 'label' => E::ts('Enabled'), + 'label' => E::ts('Default'), 'sortable' => TRUE, + 'rewrite' => '{ }', + 'icons' => [ + [ + 'icon' => 'fa-check', + 'side' => 'left', + 'if' => [ + 'OptionGroup_OptionValue_option_group_id_01.is_default', + '=', + TRUE, + ], + ], + ], ], [ 'type' => 'field', @@ -109,64 +125,37 @@ return [ 'sortable' => TRUE, ], [ + 'text' => '', + 'style' => 'default', 'size' => 'btn-xs', + 'icon' => 'fa-bars', 'links' => [ [ 'entity' => '', 'action' => '', 'join' => '', 'target' => 'crm-popup', - 'icon' => '', + 'icon' => 'fa-pencil', 'text' => E::ts('Edit'), 'style' => 'default', - 'path' => 'civicrm/admin/labelFormats?action=update&id=[OptionGroup_OptionValue_option_group_id_01.id]&group=[name]&reset=1', + 'path' => 'civicrm/admin/labelFormats/edit?action=update&id=[OptionGroup_OptionValue_option_group_id_01.id]&group=[name]&reset=1', 'task' => '', 'condition' => [], ], - ], - 'type' => 'buttons', - 'alignment' => 'text-right', - ], - [ - 'size' => 'btn-xs', - 'links' => [ [ - 'entity' => '', - 'action' => '', - 'join' => '', - 'target' => '', - 'icon' => '', + 'path' => 'civicrm/admin/labelFormats/edit?action=copy&id=[OptionGroup_OptionValue_option_group_id_01.id]&group=[name]&reset=1', + 'icon' => 'fa-clone', 'text' => E::ts('Copy'), 'style' => 'default', - 'path' => 'civicrm/admin/labelFormats?action=copy&id=[OptionGroup_OptionValue_option_group_id_01.id]&group=[name]&reset=1', - 'task' => '', 'condition' => [], - ], - ], - 'type' => 'buttons', - 'alignment' => 'text-right', - ], - [ - 'size' => 'btn-xs', - 'links' => [ - [ - 'entity' => 'OptionValue', - 'action' => 'delete', - 'join' => 'OptionGroup_OptionValue_option_group_id_01', - 'target' => 'crm-popup', - 'icon' => 'fa-trash', - 'text' => E::ts('Delete'), - 'style' => 'danger', - 'path' => '', 'task' => '', - 'condition' => [ - 'OptionGroup_OptionValue_option_group_id_01.grouping', - '=', - 'Custom', - ], + 'entity' => '', + 'action' => '', + 'join' => '', + 'target' => 'crm-popup', ], ], - 'type' => 'buttons', + 'type' => 'menu', 'alignment' => 'text-right', ], ], @@ -184,11 +173,12 @@ return [ 'style' => 'default', 'target' => 'crm-popup', 'join' => '', - 'path' => 'civicrm/admin/labelFormats?action=add&reset=1', + 'path' => 'civicrm/admin/labelFormats/edit?action=add&reset=1', 'task' => '', 'condition' => [], ], ], + 'headerCount' => FALSE, ], ], 'match' => [ -- 2.25.1