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

Merge branch '1245-Anadir-resumen-de-grupos-como-elemento-de-consola-visual-2' into 'develop' 

Let create a group status visual map element without image selected - #1245

See merge request !816
This commit is contained in:
vgilc 2017-09-13 17:15:34 +02:00
parent 754697f51c 7b2e2fadc6
commit 2620de69e6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -691,7 +691,7 @@ function create_button_palette_callback() {
alert('Undefined height');
validate = false;
}
if ((values['label'] == '') && (values['image'] == '')) {
if ((values['label'] == '') && (values['image'] == '') && (values['show_statistics']) == false) {
alert($("#message_alert_no_label_no_image").html());
validate = false;
}

2
pandora_console/include/functions_visual_map.php
View File

@ -1213,7 +1213,7 @@ function visual_map_print_item($mode = "read", $layoutData,
break;
case STATIC_GRAPH:
case GROUP_ITEM:
if ($layoutData['image'] != null) {
if ($layoutData['image'] != null || $layoutData['show_statistics'] == 1) {
$img_style_title = strip_tags($label);