From d53f97c93e2ebcf4dcd8c2954a31076a8fe40571 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Mon, 30 Mar 2026 11:07:20 -0400 Subject: [PATCH] Adjust top filters for Provisioning History Records (CFM-280) (#380) --- app/src/Model/Table/GroupMembersTable.php | 1 - .../Table/ProvisioningHistoryRecordsTable.php | 27 ++++++++++++++++++- app/templates/element/filter/filter.php | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/app/src/Model/Table/GroupMembersTable.php b/app/src/Model/Table/GroupMembersTable.php index 1dff6545c..1c67fe15d 100644 --- a/app/src/Model/Table/GroupMembersTable.php +++ b/app/src/Model/Table/GroupMembersTable.php @@ -53,7 +53,6 @@ class GroupMembersTable extends Table { use \App\Lib\Traits\SearchFilterTrait; use \App\Lib\Traits\TableMetaTrait; use \App\Lib\Traits\ValidationTrait; - use \App\Lib\Traits\SearchFilterTrait; /** * Provide the default layout diff --git a/app/src/Model/Table/ProvisioningHistoryRecordsTable.php b/app/src/Model/Table/ProvisioningHistoryRecordsTable.php index 3323fb6f7..94868de6f 100644 --- a/app/src/Model/Table/ProvisioningHistoryRecordsTable.php +++ b/app/src/Model/Table/ProvisioningHistoryRecordsTable.php @@ -76,7 +76,11 @@ public function initialize(array $config): void { 'statuses' => [ 'type' => 'enum', 'class' => 'ProvisioningStatusEnum' - ] + ], + 'provisioningTargets' => [ + 'type' => 'select', + 'model' => 'ProvisioningTargets' + ], ]); $this->setIndexContains(['ProvisioningTargets']); @@ -99,6 +103,27 @@ public function initialize(array $config): void { 'index' => ['platformAdmin', 'coAdmin'] ] ]); + + $this->setFilterConfig([ + 'provisioning_target_id' => [ + 'type' => 'select', + 'active' => true, + 'model' => 'ProvisioningHistoryRecords.ProvisioningTargets', + 'order' => 1 + ], + 'subjectid' => [ + 'active' => false, + 'type' => 'integer', + 'model' => 'ProvisioningHistoryRecords', + 'order' => 2 + ], + 'subject_model' => [ + 'active' => false, + 'type' => 'select', + 'model' => 'ProvisioningHistoryRecords', + 'order' => 3 + ], + ]); } /** diff --git a/app/templates/element/filter/filter.php b/app/templates/element/filter/filter.php index 7259b98cd..1a3e0d3ad 100644 --- a/app/templates/element/filter/filter.php +++ b/app/templates/element/filter/filter.php @@ -82,7 +82,7 @@ set('vv_active_search_filters_count', 0) ?> - +