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

Merge branch '3125_Fallo_en_calendario_Begin_Date_en_el_filtro_de_las_combined_graph' into 'develop' 

Fixed calendar in combined graphs

See merge request artica/pandorafms!2005

Former-commit-id: a7df2231f2c3b6e94b9d3273c99112f07c258441
This commit is contained in:
Samuel Carcases 2019-01-03 16:41:21 +01:00
parent 361b85efb8 099e0e6ed2
commit 05cc3d0538
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/operation/agentes/graphs.php
View File

@ -18,6 +18,7 @@ global $config;
require_once ("include/functions_agents.php");
require_once ("include/functions_custom_graphs.php");
ui_require_javascript_file ('calendar');
if (! check_acl ($config['id_user'], $id_grupo, "AR") && ! check_acl ($config['id_user'], 0, "AW")) {
db_pandora_audit("ACL Violation",
@ -242,7 +243,7 @@ echo '</div>';
//Dialog to save the custom graph
echo "<div id='dialog_save_custom_graph' style='display: none;'>";
$table = null;
$table = new stdClass();
$table->width = '100%';
$table->style[0] = 'font-weight: bolder; text-align: right;';
$table->data[0][0] = __('Name custom graph');