Merge branch '1041-module-charts-with-standar-perms-dev' into 'develop'

Added second check to period field in module charts (admin have diferent field name)

See merge request !610
This commit is contained in:
vgilc 2017-07-13 11:42:11 +02:00
commit 43f7bcde39
1 changed files with 4 additions and 1 deletions

View File

@ -150,7 +150,10 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
$avg_only = $show_other;
}
$period = get_parameter ("period", SECONDS_1DAY);
$period = get_parameter ("period");
if ($period == "") {
$period = get_parameter ("period_select", SECONDS_1DAY);
}
$id = get_parameter ("id", 0);
$width = get_parameter ("width", STATWIN_DEFAULT_CHART_WIDTH);
$height = get_parameter ("height", STATWIN_DEFAULT_CHART_HEIGHT);