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

Merge pull request #11352 from inietov/fixes/assets_transformer_date_customfields_fixes

Browse source 
Fixed #11335 Assets transformer date customfields issues
This commit is contained in:
snipe 2022-06-21 17:56:17 -07:00 committed by GitHub
parent 87980643ea 3a5c09c424
commit 6bc525bc25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -100,7 +100,7 @@ class AssetsTransformer
if ($field->format == 'DATE'){
if (Gate::allows('superadmin')){
$value = Helper::getFormattedDateObject($value)['formatted'];
$value = Helper::getFormattedDateObject($value, 'date', false);
} else {
$value = strtoupper(trans('admin/custom_fields/general.encrypted'));
}
@ -117,7 +117,7 @@ class AssetsTransformer
$value = $asset->{$field->convertUnicodeDbSlug()};
if (($field->format == 'DATE') && (!is_null($value)) && ($value!='')){
$value = Helper::getFormattedDateObject($value)['formatted'];
$value = Helper::getFormattedDateObject($value, 'date', false);
}
$fields_array[$field->name] = [