tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-11592-las-etiquetas-de-texto-en-la-consola-visual-van-mal' into 'develop' 

Ent 11592 las etiquetas de texto en la consola visual van mal

See merge request artica/pandorafms!6115
This commit is contained in:
Matias Didier 2023-06-16 07:41:49 +00:00
parent 2aedb985ae 8d9d319e98
commit d0998432df
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/rest-api/models/VisualConsole/Item.php
View File

@ -1865,6 +1865,10 @@ class Item extends CachedModel
$save = array_merge($dataModelEncode, $dataEncode); $save = array_merge($dataModelEncode, $dataEncode);
if (!empty($save['label'])) {
$save['label'] = io_safe_output(io_safe_input(str_replace("'", "\'", $save['label'])));
}
$result = \db_process_sql_update( $result = \db_process_sql_update(
'tlayout_data', 'tlayout_data',
$save, $save,

4
pandora_console/include/rest-api/models/VisualConsole/Items/Label.php
View File

@ -90,11 +90,11 @@ final class Label extends Item
// Default values. // Default values.
if (isset($values['width']) === false) { if (isset($values['width']) === false) {
$values['width'] = 10; $values['width'] = 50;
} }
if (isset($values['height']) === false) { if (isset($values['height']) === false) {
$values['height'] = 10; $values['height'] = 50;
} }
return $values; return $values;

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

@ -12240,3 +12240,8 @@ div.parent_graph > p.legend_background > table > tbody > tr {
.toggle-traffic-graph { .toggle-traffic-graph {
margin: 0px !important; margin: 0px !important;
} }
div#visual-console-container * {
font-size: unset;
line-height: unset;
}