DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 14:27:33 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2022-06-13 23:52:48 -07:00
parent ea1ff1e8bb 8857391da7
commit b448c89655
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Transformers/AssetsTransformer.php
View file

@ -117,9 +117,10 @@ class AssetsTransformer
} else { } else {
$value = $asset->{$field->convertUnicodeDbSlug()}; $value = $asset->{$field->convertUnicodeDbSlug()};
if ($field->format == 'DATE'){ if ($field->format == 'DATE' && !is_null($value)){
$value = Helper::getFormattedDateObject($value)['formatted']; $value = Helper::getFormattedDateObject($value)['formatted'];
} }
$fields_array[$field->name] = [ $fields_array[$field->name] = [
'field' => e($field->convertUnicodeDbSlug()), 'field' => e($field->convertUnicodeDbSlug()),
'value' => e($value), 'value' => e($value),