Skip to content

A free open source IT asset/license management system

Fixed FD-57196 double formatting on date custom fields in edit

snipe1a0b368ec3f1
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index a12bd8ad37..83b6cb1e40 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -1285,11 +1285,32 @@ class Helper
return strtoupper(trans('admin/custom_fields/general.encrypted'));
}
- if (isset($item)) {
- return self::gracefulDecrypt($field, $item->{$field->db_column_name()});
+ $value = isset($item)
+ ? self::gracefulDecrypt($field, $item->{$field->db_column_name()})
+ : $field->defaultValue($model->id);
+
+ // DATE / DATETIME custom fields can hold non-YYYY-MM-DD strings
+ // in the DB (e.g. `3/28/2025` from a historic CSV import that
+ // shoved raw cell values into the column). The datepicker
+ // widgets expect `Y-m-d` / `Y-m-d H:i:s` and blank or mangle
+ // anything else. AssetsTransformer already normalizes on the
+ // view / API read path via getFormattedDateObject; do the
+ // same here so the edit form renders a value the picker can
+ // hydrate. Save cycle rewrites the column to YYYY-MM-DD via
+ // the picker's own output, so the DB heals per-edit. Any
+ // value Carbon cannot parse falls through unchanged so the
+ // user sees the raw string and can correct it.
+ if (in_array($field->format, ['DATE', 'DATETIME'], true) && ! empty($value)) {
+ try {
+ $value = $field->format === 'DATETIME'
+ ? Carbon::parse($value)->format('Y-m-d H:i:s')
+ : Carbon::parse($value)->format('Y-m-d');
+ } catch (\Exception $e) {
+ // Unparseable value stays as-is.
+ }
}
- return $field->defaultValue($model->id);
+ return $value;
}
public static function formatStandardApiResponse($status, $payload = null, $messages = null)
diff --git a/tests/Unit/Helpers/HelperTest.php b/tests/Unit/Helpers/HelperTest.php
index 168d155850..a5f013d241 100644
--- a/tests/Unit/Helpers/HelperTest.php
+++ b/tests/Unit/Helpers/HelperTest.php
@@ -433,4 +433,79 @@ class HelperTest extends TestCase
Helper::customFieldFormValue($field, null, $model)
);
}
+
+ /**
+ * Regression coverage for historic CSV-imported values on DATE / DATETIME
+ * custom fields. AssetImporter shoves raw CSV strings straight into
+ * custom-field columns, so a column can legitimately hold `M/D/YYYY`
+ * or similar. The view path already normalizes on read via
+ * AssetsTransformer + getFormattedDateObject; this helper does the
+ * matching normalization for the edit form so the datepicker widget
+ * gets a value in its expected `Y-m-d` / `Y-m-d H:i:s` shape and
+ * doesn't blank or mangle it on hydrate.
+ */
+ public function test_custom_field_form_value_normalizes_us_formatted_date_to_ymd(): void
+ {
+ \App\Models\CustomField::factory()->create([
+ 'name' => 'Warranty Start Date',
+ 'format' => 'DATE',
+ 'element' => 'date_picker',
+ ]);
+ $field = \App\Models\CustomField::where('name', 'Warranty Start Date')->first();
+ $asset = new \App\Models\Asset;
+ $asset->{$field->db_column} = '3/28/2025';
+ $model = \App\Models\AssetModel::factory()->make();
+
+ $this->assertSame('2025-03-28', Helper::customFieldFormValue($field, $asset, $model));
+ }
+
+ public function test_custom_field_form_value_normalizes_us_formatted_datetime_to_ymd_his(): void
+ {
+ \App\Models\CustomField::factory()->create([
+ 'name' => 'Last Serviced',
+ 'format' => 'DATETIME',
+ 'element' => 'datetime_picker',
+ ]);
+ $field = \App\Models\CustomField::where('name', 'Last Serviced')->first();
+ $asset = new \App\Models\Asset;
+ $asset->{$field->db_column} = '3/28/2025 09:15:00';
+ $model = \App\Models\AssetModel::factory()->make();
+
+ $this->assertSame('2025-03-28 09:15:00', Helper::customFieldFormValue($field, $asset, $model));
+ }
+
+ public function test_custom_field_form_value_leaves_already_normalized_date_untouched(): void
+ {
+ \App\Models\CustomField::factory()->create([
+ 'name' => 'Audited',
+ 'format' => 'DATE',
+ 'element' => 'date_picker',
+ ]);
+ $field = \App\Models\CustomField::where('name', 'Audited')->first();
+ $asset = new \App\Models\Asset;
+ $asset->{$field->db_column} = '2026-08-20';
+ $model = \App\Models\AssetModel::factory()->make();
+
+ $this->assertSame('2026-08-20', Helper::customFieldFormValue($field, $asset, $model));
+ }
+
+ public function test_custom_field_form_value_leaves_unparseable_date_value_untouched(): void
+ {
+ // Free-text values that were stored in a DATE-format column
+ // (`2028 1st Qtr` and similar) can't be Carbon-parsed. The
+ // helper falls through with the raw string so the user sees
+ // and can correct it, instead of masking it with a fake
+ // "normalized" date.
+ \App\Models\CustomField::factory()->create([
+ 'name' => 'End of Lease Date',
+ 'format' => 'DATE',
+ 'element' => 'date_picker',
+ ]);
+ $field = \App\Models\CustomField::where('name', 'End of Lease Date')->first();
+ $asset = new \App\Models\Asset;
+ $asset->{$field->db_column} = '2028 1st Qtr';
+ $model = \App\Models\AssetModel::factory()->make();
+
+ $this->assertSame('2028 1st Qtr', Helper::customFieldFormValue($field, $asset, $model));
+ }
}