ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only care about the converted name when updating the custom field itself

Browse Source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe
2022-06-27 14:17:07 -07:00
parent 518395bbc7
commit baad3b9d58
7 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Transformers/AssetsTransformer.php
+5 -5
View File
@@ -94,8 +94,8 @@ class AssetsTransformer
$fields_array = [];
foreach ($asset->model->fieldset->fields as $field) {
if ($field->isFieldDecryptable($asset->{$field->convertUnicodeDbSlug()})) {
$decrypted = Helper::gracefulDecrypt($field, $asset->{$field->convertUnicodeDbSlug()});
if ($field->isFieldDecryptable($asset->{$field->db_column})) {
$decrypted = Helper::gracefulDecrypt($field, $asset->{$field->db_column});
$value = (Gate::allows('superadmin')) ? $decrypted : strtoupper(trans('admin/custom_fields/general.encrypted'));
if ($field->format == 'DATE'){
@@ -107,21 +107,21 @@ class AssetsTransformer
}
$fields_array[$field->name] = [
'field' => e($field->convertUnicodeDbSlug()),
'field' => e($field->db_column),
'value' => e($value),
'field_format' => $field->format,
'element' => $field->element,
];
} else {
$value = $asset->{$field->convertUnicodeDbSlug()};
$value = $asset->{$field->db_column};
if (($field->format == 'DATE') && (!is_null($value)) && ($value!='')){
$value = Helper::getFormattedDateObject($value, 'date', false);
}
$fields_array[$field->name] = [
'field' => e($field->convertUnicodeDbSlug()),
'field' => e($field->db_column),
'value' => e($value),
'field_format' => $field->format,
'element' => $field->element,