From ff89fb7a340f132da0e04afcd6b483ca5c7f45f7 Mon Sep 17 00:00:00 2001 From: Michael Stenta Date: Wed, 21 Feb 2024 08:46:54 -0500 Subject: [PATCH] Set the minimum value of maturity_days and transplant_days to 1. --- CHANGELOG.md | 4 ++ ...taxonomy_term.plant_type.maturity_days.yml | 2 +- ...xonomy_term.plant_type.transplant_days.yml | 2 +- .../farm_plant_type.post_update.php | 38 +++++++++++++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 modules/taxonomy/plant_type/farm_plant_type.post_update.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 20dbdd38e..e349a8e7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- [Set the minimum value of maturity_days and transplant_days to 1 #794](https://github.com/farmOS/farmOS/pull/794) + ### Fixed - [Check for correct update operation access in location hierarchy form #800](https://github.com/farmOS/farmOS/pull/800) diff --git a/modules/taxonomy/plant_type/config/install/field.field.taxonomy_term.plant_type.maturity_days.yml b/modules/taxonomy/plant_type/config/install/field.field.taxonomy_term.plant_type.maturity_days.yml index 95d237304..d77410075 100644 --- a/modules/taxonomy/plant_type/config/install/field.field.taxonomy_term.plant_type.maturity_days.yml +++ b/modules/taxonomy/plant_type/config/install/field.field.taxonomy_term.plant_type.maturity_days.yml @@ -18,7 +18,7 @@ translatable: false default_value: { } default_value_callback: '' settings: - min: null + min: 1 max: null prefix: '' suffix: ' day| days' diff --git a/modules/taxonomy/plant_type/config/install/field.field.taxonomy_term.plant_type.transplant_days.yml b/modules/taxonomy/plant_type/config/install/field.field.taxonomy_term.plant_type.transplant_days.yml index a10f82e8b..672483ec0 100644 --- a/modules/taxonomy/plant_type/config/install/field.field.taxonomy_term.plant_type.transplant_days.yml +++ b/modules/taxonomy/plant_type/config/install/field.field.taxonomy_term.plant_type.transplant_days.yml @@ -18,7 +18,7 @@ translatable: false default_value: { } default_value_callback: '' settings: - min: null + min: 1 max: null prefix: '' suffix: ' day| days' diff --git a/modules/taxonomy/plant_type/farm_plant_type.post_update.php b/modules/taxonomy/plant_type/farm_plant_type.post_update.php new file mode 100644 index 000000000..326149b8e --- /dev/null +++ b/modules/taxonomy/plant_type/farm_plant_type.post_update.php @@ -0,0 +1,38 @@ +setSetting('min', 1); + $field->save(); + } + } + + // Delete any zero values from the database. + $tables = [ + 'taxonomy_term__maturity_days' => 'maturity_days_value', + 'taxonomy_term__transplant_days' => 'transplant_days_value', + 'taxonomy_term_revision__maturity_days' => 'maturity_days_value', + 'taxonomy_term_revision__transplant_days' => 'transplant_days_value', + ]; + foreach ($tables as $table => $column) { + \Drupal::database()->query('DELETE FROM {' . $table . '} WHERE ' . $column . ' = 0'); + } +}