From 3e8837dd6ec6f93dd861eefb3d4cfbb68062140a Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 13 Jun 2022 22:13:18 -0700 Subject: [PATCH 1/2] Bumped dev branch to 6.0.3 Signed-off-by: snipe --- config/version.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/version.php b/config/version.php index eccbe7a1b..35661e2f8 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v6.0.2', - 'full_app_version' => 'v6.0.2 - build 7961-g5bc5e9f10', - 'build_version' => '7961', + 'app_version' => 'v6.0.3', + 'full_app_version' => 'v6.0.3 - build 8046-gea1ff1e8b', + 'build_version' => '8046', 'prerelease_version' => '', - 'hash_version' => 'g5bc5e9f10', - 'full_hash' => 'v6.0.2-69-g5bc5e9f10', - 'branch' => 'master', -); + 'hash_version' => 'gea1ff1e8b', + 'full_hash' => 'v6.0.3-154-gea1ff1e8b', + 'branch' => 'develop', +); \ No newline at end of file From 50c008ead5a13a245a965d36bca9ddb151e4d39e Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Tue, 14 Jun 2022 01:37:15 -0500 Subject: [PATCH 2/2] Adds check in condition that format custom dates --- app/Http/Transformers/AssetsTransformer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index 49b74b1e9..4abb4b920 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -117,9 +117,10 @@ class AssetsTransformer } else { $value = $asset->{$field->convertUnicodeDbSlug()}; - if ($field->format == 'DATE'){ + if ($field->format == 'DATE' && !is_null($value)){ $value = Helper::getFormattedDateObject($value)['formatted']; } + $fields_array[$field->name] = [ 'field' => e($field->convertUnicodeDbSlug()), 'value' => e($value),