mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-29 08:45:12 +02:00
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:
commit
05cc3d0538
@ -18,6 +18,7 @@ global $config;
|
|||||||
|
|
||||||
require_once ("include/functions_agents.php");
|
require_once ("include/functions_agents.php");
|
||||||
require_once ("include/functions_custom_graphs.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")) {
|
if (! check_acl ($config['id_user'], $id_grupo, "AR") && ! check_acl ($config['id_user'], 0, "AW")) {
|
||||||
db_pandora_audit("ACL Violation",
|
db_pandora_audit("ACL Violation",
|
||||||
@ -242,7 +243,7 @@ echo '</div>';
|
|||||||
|
|
||||||
//Dialog to save the custom graph
|
//Dialog to save the custom graph
|
||||||
echo "<div id='dialog_save_custom_graph' style='display: none;'>";
|
echo "<div id='dialog_save_custom_graph' style='display: none;'>";
|
||||||
$table = null;
|
$table = new stdClass();
|
||||||
$table->width = '100%';
|
$table->width = '100%';
|
||||||
$table->style[0] = 'font-weight: bolder; text-align: right;';
|
$table->style[0] = 'font-weight: bolder; text-align: right;';
|
||||||
$table->data[0][0] = __('Name custom graph');
|
$table->data[0][0] = __('Name custom graph');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user