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

Some fixes in the visualmap.

This commit is contained in:
mdtrooper 2015-07-16 15:12:47 +02:00
parent 8b608a43f5
commit 75873b02d4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/godmode/reporting/map_builder.php
View File

@ -43,7 +43,7 @@ if (!defined('METACONSOLE')) {
$id_layout = (int) get_parameter ('id_layout');
$copy_layout = (bool) get_parameter ('copy_layout');
$delete_layout = (bool) get_parameter ('delete_layout');
$refr = (int) get_parameter('refr');
$refr = (int) get_parameter('refr', 60);
$offset = (int) get_parameter('offset', 0);
$pagination = (int) get_parameter ("pagination", $config["block_size"]);
@ -238,7 +238,8 @@ else {
if ($own_info['is_admin'] || $vconsoles_read) {
$maps = visual_map_get_user_layouts (0,false,$filters);
$total_maps = count(visual_map_get_user_layouts());
} else {
}
else {
$maps = visual_map_get_user_layouts ($config['id_user'], false,
$filters, false);
$total_maps = count(visual_map_get_user_layouts ($config['id_user'], false,

3
pandora_console/include/functions_visual_map.php
View File

@ -1894,6 +1894,9 @@ function visual_map_get_user_layouts ($id_user = 0, $only_names = false, $filter
$groups = users_get_groups ($id_user, 'RR', false);
if (!empty($groups)) {
if (empty($where))
$where = "";
if ($where != '') {
$where .= ' AND ';
}