diff --git a/app/src/Lib/Traits/SearchFilterTrait.php b/app/src/Lib/Traits/SearchFilterTrait.php index b6ba84e60..ce34d271b 100644 --- a/app/src/Lib/Traits/SearchFilterTrait.php +++ b/app/src/Lib/Traits/SearchFilterTrait.php @@ -299,15 +299,15 @@ public function getSearchableAttributes(string $controller, ViewBuilder $viewBui // Include meta fields that are defined in the configuration // FORCE USAGE - $filterMetadatFielsList = $this->filterMetadataFields(); + $filterMetadatFieldsList = $this->filterMetadataFields(); foreach ($filterKeys as $key) { - if (isset($filterMetadatFielsList['meta'][$key])) { - $filterMetadatFielsList[$key] = $filterMetadatFielsList['meta'][$key]; + if (isset($filterMetadatFieldsList['meta'][$key])) { + $filterMetadatFieldsList[$key] = $filterMetadatFieldsList['meta'][$key]; } } - foreach ($filterMetadatFielsList as $column => $type) { + foreach ($filterMetadatFieldsList as $column => $type) { // If the column is an array, then we are accessing the Metadata fields. Skip if(\is_array($type)) { continue; diff --git a/app/src/Model/Table/JobsTable.php b/app/src/Model/Table/JobsTable.php index e7b9cb998..150c31e3c 100644 --- a/app/src/Model/Table/JobsTable.php +++ b/app/src/Model/Table/JobsTable.php @@ -49,6 +49,7 @@ class JobsTable extends Table { use \App\Lib\Traits\QueryModificationTrait; use \App\Lib\Traits\TableMetaTrait; use \App\Lib\Traits\ValidationTrait; + use \App\Lib\Traits\SearchFilterTrait; /** * Perform Cake Model initialization. @@ -96,6 +97,47 @@ public function initialize(array $config): void { 'class' => 'JobStatusEnum' ] ]); + + // Hide the following fields from filters by default; + // their 'active' state is set to false. + $this->setFilterConfig([ + 'requeued_from_job_id' => [ + 'type' => 'field', + 'model' => 'Jobs', + 'active' => false, + 'order' => 1 + ], + 'retry_interval' => [ + 'type' => 'field', + 'model' => 'Jobs', + 'active' => false, + 'order' => 99 + ], + 'requeue_interval' => [ + 'type' => 'field', + 'model' => 'Jobs', + 'active' => false, + 'order' => 99 + ], + 'max_retry' => [ + 'type' => 'field', + 'model' => 'Jobs', + 'active' => false, + 'order' => 99 + ], + 'retry_count' => [ + 'type' => 'field', + 'model' => 'Jobs', + 'active' => false, + 'order' => 99 + ], + 'percent_complete' => [ + 'type' => 'field', + 'model' => 'Jobs', + 'active' => false, + 'order' => 99 + ], + ]); $this->setViewContains([ 'RequeuedFromJobs' diff --git a/app/templates/element/filter/filter.php b/app/templates/element/filter/filter.php index 7259b98cd..908678a8d 100644 --- a/app/templates/element/filter/filter.php +++ b/app/templates/element/filter/filter.php @@ -111,13 +111,15 @@ -