Merge branch 'ent-3578-ACL-visual-consol-not-working-properly' into 'develop'
Ent 3578 acl visual consol not working properly See merge request artica/pandorafms!2250 Former-commit-id: 66f3e799ed124327f73061962a40dd1f63174b21
This commit is contained in:
commit
80fb8679a3
|
@ -506,8 +506,6 @@ function menu_add_extras(&$menu)
|
||||||
|
|
||||||
$menu_extra['workspace']['sub']['operation/incidents/incident_detail']['text'] = __('Manage incident');
|
$menu_extra['workspace']['sub']['operation/incidents/incident_detail']['text'] = __('Manage incident');
|
||||||
|
|
||||||
$menu_extra['reporting']['sub']['godmode/reporting/visual_console_builder']['text'] = __('Manage visual console');
|
|
||||||
|
|
||||||
// Duplicate extensions as sec=extension to check it from url
|
// Duplicate extensions as sec=extension to check it from url
|
||||||
foreach ($menu as $k => $m) {
|
foreach ($menu as $k => $m) {
|
||||||
if (!isset($m['sub'])) {
|
if (!isset($m['sub'])) {
|
||||||
|
@ -645,6 +643,7 @@ function menu_get_sec_pages($sec, $menu_hash=false)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the pages in a section2
|
* Get the pages in a section2
|
||||||
|
* $menu
|
||||||
*
|
*
|
||||||
* @param string sec code
|
* @param string sec code
|
||||||
* @param string menu hash. All the menu structure (For example
|
* @param string menu hash. All the menu structure (For example
|
||||||
|
|
|
@ -476,7 +476,7 @@ function visual_map_print_item(
|
||||||
}
|
}
|
||||||
} else if ($is_a_link_to_other_visualconsole) {
|
} else if ($is_a_link_to_other_visualconsole) {
|
||||||
if (!is_metaconsole()) {
|
if (!is_metaconsole()) {
|
||||||
$url = $config['homeurl'].'index.php?sec=reporting&sec2=operation/visual_console/render_view&pure='.$config['pure'].'&id='.$layoutData['id_layout_linked'];
|
$url = $config['homeurl'].'index.php?sec=network&sec2=operation/visual_console/render_view&pure='.$config['pure'].'&id='.$layoutData['id_layout_linked'];
|
||||||
} else {
|
} else {
|
||||||
$url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$layoutData['id_layout_linked'].'&refr=0';
|
$url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$layoutData['id_layout_linked'].'&refr=0';
|
||||||
}
|
}
|
||||||
|
@ -567,7 +567,7 @@ function visual_map_print_item(
|
||||||
if (METACONSOLE == 1) {
|
if (METACONSOLE == 1) {
|
||||||
$url = $config['homeurl'].'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$layoutData['id_layout_linked'].'&refr=300';
|
$url = $config['homeurl'].'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$layoutData['id_layout_linked'].'&refr=300';
|
||||||
} else {
|
} else {
|
||||||
$url = $config['homeurl'].'index.php?sec=reporting&sec2=operation/visual_console/render_view&pure='.$config['pure'].'&id='.$layoutData['id_layout_linked'];
|
$url = $config['homeurl'].'index.php?sec=network&sec2=operation/visual_console/render_view&pure='.$config['pure'].'&id='.$layoutData['id_layout_linked'];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (METACONSOLE == 1) {
|
if (METACONSOLE == 1) {
|
||||||
|
@ -581,7 +581,7 @@ function visual_map_print_item(
|
||||||
case LABEL:
|
case LABEL:
|
||||||
if ($layoutData['id_layout_linked'] != 0) {
|
if ($layoutData['id_layout_linked'] != 0) {
|
||||||
// Link to a map
|
// Link to a map
|
||||||
$url = $config['homeurl'].'index.php?sec=reporting&sec2=operation/visual_console/render_view&pure='.$config['pure'].'&id='.$layoutData['id_layout_linked'];
|
$url = $config['homeurl'].'index.php?sec=network&sec2=operation/visual_console/render_view&pure='.$config['pure'].'&id='.$layoutData['id_layout_linked'];
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -590,7 +590,7 @@ function visual_map_print_item(
|
||||||
if ($layoutData['id_layout_linked'] != 0) {
|
if ($layoutData['id_layout_linked'] != 0) {
|
||||||
// Link to a map
|
// Link to a map
|
||||||
if (empty($layoutData['id_metaconsole'])) {
|
if (empty($layoutData['id_metaconsole'])) {
|
||||||
$url = 'index.php?sec=reporting&sec2=operation/visual_console/render_view&pure='.$config['pure'].'&id='.$layoutData['id_layout_linked'];
|
$url = 'index.php?sec=network&sec2=operation/visual_console/render_view&pure='.$config['pure'].'&id='.$layoutData['id_layout_linked'];
|
||||||
} else {
|
} else {
|
||||||
$pure = get_parameter('pure', 0);
|
$pure = get_parameter('pure', 0);
|
||||||
$url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_visualmap='.$layoutData['id_layout_linked'].'&refr=0';
|
$url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_visualmap='.$layoutData['id_layout_linked'].'&refr=0';
|
||||||
|
@ -638,7 +638,7 @@ function visual_map_print_item(
|
||||||
} else if ($layoutData['id_layout_linked'] > 0) {
|
} else if ($layoutData['id_layout_linked'] > 0) {
|
||||||
// Link to a map
|
// Link to a map
|
||||||
if (empty($layoutData['id_metaconsole'])) {
|
if (empty($layoutData['id_metaconsole'])) {
|
||||||
$url = 'index.php?sec=reporting&sec2=operation/visual_console/render_view&pure='.$config['pure'].'&id='.$layoutData['id_layout_linked'];
|
$url = 'index.php?sec=network&sec2=operation/visual_console/render_view&pure='.$config['pure'].'&id='.$layoutData['id_layout_linked'];
|
||||||
} else {
|
} else {
|
||||||
$pure = get_parameter('pure', 0);
|
$pure = get_parameter('pure', 0);
|
||||||
$url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_visualmap='.$layoutData['id_layout_linked'].'&refr=0';
|
$url = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure='.$pure.'&id_visualmap='.$layoutData['id_layout_linked'].'&refr=0';
|
||||||
|
|
Loading…
Reference in New Issue