tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-19 20:04:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed JSON values import and export for dashboards

Browse Source
This commit is contained in:
Enrique Martin 2024-02-13 15:15:10 +01:00
parent c7d61902fb
commit 23bd170ff0
1 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
pandora_console/include/class/Prd.class.php
View File

@ -2155,12 +2155,14 @@ class Prd
$ref['id'], $ref['id'],
$val $val
); );
if (isset($ref['values_as_keys']) === true if ($ref_val !== false) {
&& $ref['values_as_keys'] === true if (isset($ref['values_as_keys']) === true
) { && $ref['values_as_keys'] === true
$ref_arr[$ref_val] = $ref_val; ) {
} else { $ref_arr[$ref_val] = $ref_val;
$ref_arr[] = $ref_val; } else {
$ref_arr[] = $ref_val;
}
} }
} }
@ -2269,12 +2271,14 @@ class Prd
$ref['id'], $ref['id'],
$val $val
); );
if (isset($ref['values_as_keys']) === true if ($ref_val !== false) {
&& $ref['values_as_keys'] === true if (isset($ref['values_as_keys']) === true
) { && $ref['values_as_keys'] === true
$ref_arr[$ref_val] = $ref_val; ) {
} else { $ref_arr[$ref_val] = $ref_val;
$ref_arr[] = $ref_val; } else {
$ref_arr[] = $ref_val;
}
} }
} }
@ -2358,18 +2362,20 @@ class Prd
is_array($val) ? json_encode($val) : $val is_array($val) ? json_encode($val) : $val
); );
if ($ref_val === false && $ref_val != $val) { if ($ref_val === false && $ref_val != is_array($val) ? json_encode($val) : $val) {
if ($this->evalAutocreateItem($condition['ref'], $val, $column) === false) { if ($this->evalAutocreateItem($condition['ref'], is_array($val) ? json_encode($val) : $val, $column) === false) {
return false; return false;
} }
} }
if (isset($condition['ref']['values_as_keys']) === true if ($ref_val !== false) {
&& $condition['ref']['values_as_keys'] === true if (isset($ref['values_as_keys']) === true
) { && $ref['values_as_keys'] === true
$ref_arr[$ref_val] = $ref_val; ) {
} else { $ref_arr[$ref_val] = $ref_val;
$ref_arr[] = $ref_val; } else {
$ref_arr[] = $ref_val;
}
} }
} }
@ -2445,18 +2451,20 @@ class Prd
is_array($val) ? json_encode($val) : $val is_array($val) ? json_encode($val) : $val
); );
if ($ref_val === false && $ref_val != $val) { if ($ref_val === false && $ref_val != is_array($val) ? json_encode($val) : $val) {
if ($this->evalAutocreateItem($ref, $val, $column) === false) { if ($this->evalAutocreateItem($ref, is_array($val) ? json_encode($val) : $val, $column) === false) {
return false; return false;
} }
} }
if (isset($ref['values_as_keys']) === true if ($ref_val !== false) {
&& $ref['values_as_keys'] === true if (isset($ref['values_as_keys']) === true
) { && $ref['values_as_keys'] === true
$ref_arr[$ref_val] = $ref_val; ) {
} else { $ref_arr[$ref_val] = $ref_val;
$ref_arr[] = $ref_val; } else {
$ref_arr[] = $ref_val;
}
} }
} }