tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-13011-opciones-avanzadas-de-filtros-de-eventos-en-meta-no-tiene-borde' into 'develop'

Browse Source 
Ent 13011 opciones avanzadas de filtros de eventos en meta no tiene borde

See merge request artica/pandorafms!7038
This commit is contained in:
Jose Martin 2024-03-26 11:24:00 +00:00
commit 659e2b2db7
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/include/ajax/demo_data.ajax.php
View File

@ -789,7 +789,6 @@ if ($action === 'create_demo_data') {
}
// Get last trap in database.
/*
$id_trap_begin = db_get_value(
'MAX(id_trap)',

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

@ -2299,10 +2299,9 @@ class Prd
);
// Get reference in value
if($columns_ref !== false) {
if ($columns_ref !== false) {
foreach ($columns_ref as $col => $col_ref) {
if (array_key_exists($col, $value[$ref['table']])) {
$sql = sprintf(
'SELECT * FROM %s WHERE %s = "%s"',
$ref['table'],
@ -2456,10 +2455,9 @@ class Prd
);
// Get reference in value
if($columns_ref !== false) {
if ($columns_ref !== false) {
foreach ($columns_ref as $col => $col_ref) {
if (array_key_exists($col, $value[$ref['table']])) {
$sql = sprintf(
'SELECT * FROM %s WHERE %s = "%s"',
$ref['table'],
@ -3149,7 +3147,7 @@ class Prd
}
}
if($columns_ref !== false) {
if ($columns_ref !== false) {
if (array_key_exists($column_name, $columns_ref)) {
$temp_value = $array_value[$ref['table']][$column_name];
$temp_value = (is_array($temp_value) ? json_encode($temp_value) : $temp_value);

4
pandora_console/include/styles/pandora.css
View File

@ -13847,3 +13847,7 @@ button.disabled {
.tabs-show {
display: list-item;
}
.white_table_graph > div {
background-color: transparent;
}