DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 22:07:29 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix for weird JSON parsing in actionlogs (#7753)

Browse source 
* Fix for weird JSON parsing in actionlogs

* Removed debugging code

* Check for the meta array

(If no fields, no array)
This commit is contained in:
snipe 2020-01-24 17:31:43 -08:00 committed by GitHub
parent ca1285ec08
commit 5f85d8132b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/Http/Transformers/ActionlogsTransformer.php
View file

@ -30,6 +30,8 @@ class ActionlogsTransformer
// This is necessary since we can't escape special characters within a JSON object // This is necessary since we can't escape special characters within a JSON object
if (($actionlog->log_meta) && ($actionlog->log_meta!='')) { if (($actionlog->log_meta) && ($actionlog->log_meta!='')) {
$meta_array = json_decode($actionlog->log_meta); $meta_array = json_decode($actionlog->log_meta);
if ($meta_array) {
foreach ($meta_array as $key => $value) { foreach ($meta_array as $key => $value) {
foreach ($value as $meta_key => $meta_value) { foreach ($value as $meta_key => $meta_value) {
@ -37,12 +39,41 @@ class ActionlogsTransformer
foreach ($meta_value as $meta_value_key => $meta_value_value) { foreach ($meta_value as $meta_value_key => $meta_value_value) {
$clean_meta[$key][$meta_value_key] = e($meta_value_value); $clean_meta[$key][$meta_value_key] = e($meta_value_value);
} }
} else {
// This object stuff is weird, and is used to make up for the fact that
// older data can get strangely formatted if an asset existed,
// then a new custom field is added, and the asset is saved again.
// It can result in funnily-formatted strings like:
//
// {"_snipeit_right_sized_fault_tolerant_localareanetwo_1":
// {"old":null,"new":{"value":"1579490695972","_snipeit_new_field_2":2,"_snipeit_new_field_3":"Monday, 20 January 2020 2:24:55 PM"}}
// so we have to walk down that next level
if (is_object($meta_value)) {
foreach ($meta_value as $meta_value_key => $meta_value_value) {
if ($meta_value_key == 'value') {
$clean_meta[$key]['old'] = null;
$clean_meta[$key]['new'] = e($meta_value->value);
} else {
$clean_meta[$meta_value_key]['old'] = null;
$clean_meta[$meta_value_key]['new'] = e($meta_value_value);
}
}
} else { } else {
$clean_meta[$key][$meta_key] = e($meta_value); $clean_meta[$key][$meta_key] = e($meta_value);
} }
}
} }
} }
}
} }