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-pandorafms2' into 'develop' 

Reverse changes for non-administrators users

See merge request artica/pandorafms!1600
This commit is contained in:
vgilc 2018-07-09 08:53:51 +02:00
parent f86465bcf3 9f9728fd03
commit a573f69593
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,12 +127,9 @@ else {
$table->data[1][0] = __('Group:');
// Only display group "All" if user is administrator
// or has "RW" privileges
$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);
true, 'id_group', $idGroup, '', '', '', true);
$backgrounds_list = list_files(
$config['homedir'] . '/images/console/background/', "jpg", 1, 0);
$backgrounds_list = array_merge($backgrounds_list,

2
pandora_console/operation/agentes/exportdata.php
View File

@ -244,7 +244,7 @@ if (empty($export_btn) || $show_form) {
$groups = users_get_groups ($config['id_user'], "RR", users_can_manage_group_all());
$table->data[0][1] = html_print_select_groups($config['id_user'],
"RR", users_can_manage_group_all(), "group", $group, '', '', 0, true, false, true,
"RR", true, "group", $group, '', '', 0, true, false, true,
'', false);
//Agent selector

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

@ -223,13 +223,9 @@ else {
100,true);
$table->data[1][0] = __('Group');
// 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);
true, 'id_group', $idGroup, '', '', '', true);
$table->data[2][0] = __('Node radius');
$table->data[2][1] = html_print_input_text ('node_radius', $node_radius, '', 2,