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

Merge branch '2173-REDIRIS-Desplegable-de-grupo-All-en-grupos' into 'develop' 

Fixed bug in pandorafms

See merge request artica/pandorafms!1523
This commit is contained in:
slerena 2018-06-25 19:05:26 +02:00
parent 40d7ef4fcb bcd937b1ba
commit c0cd577fb4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/godmode/reporting/visual_console_builder.data.php
View File

@ -126,16 +126,11 @@ else {
}
$table->data[1][0] = __('Group:');
$groups = users_get_groups ($config['id_user'], 'RW');
$own_info = get_user_info($config['id_user']);
// Only display group "All" if user is administrator
// or has "RW" privileges
if ($own_info['is_admin'] || $vconsole_write || $vconsole_manage)
$display_all_group = true;
else
$display_all_group = false;
$display_all_group = (users_is_admin() || users_can_manage_group_all("RW"));
$table->data[1][1] = html_print_select_groups($config['id_user'], "RW",
$display_all_group, 'id_group', $idGroup, '', '', '', true);
$backgrounds_list = list_files(

10
pandora_console/operation/agentes/pandora_networkmap.editor.php
View File

@ -222,8 +222,14 @@ else {
$table->data[0][1] = html_print_input_text ('name', $name, '', 30,
100,true);
$table->data[1][0] = __('Group');
$table->data[1][1] = html_print_select_groups(false, "AR", true,
'id_group', $id_group, '', '', 0, true);
// Only display group "All" if user is administrator
// or has "AR" privileges
$display_all_group = (users_is_admin() || users_can_manage_group_all("AR"));
$table->data[1][1] = html_print_select_groups($config['id_user'], "AR",
$display_all_group, 'id_group', $idGroup, '', '', '', true);
$table->data[2][0] = __('Node radius');
$table->data[2][1] = html_print_input_text ('node_radius', $node_radius, '', 2,