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

Added a new confirm message when trying to delete groups with children

This commit is contained in:
Alejandro Gallardo Escobar 2018-04-23 16:26:35 +02:00
parent 5ea4b84e97
commit 4239b669f2
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/godmode/groups/group_list.php
View File

@ -404,7 +404,8 @@ if (!empty($groups)) {
$symbolBranchs = ' symbol_branch_' . $group['parent']; $symbolBranchs = ' symbol_branch_' . $group['parent'];
$data = groups_get_group_to_list($group, $groups_count, $symbolBranchs); $has_children = isset($sons[$group['id_grupo']]);
$data = groups_get_group_to_list($group, $groups_count, $symbolBranchs, $has_children);
array_push ($table->data, $data); array_push ($table->data, $data);
$table->rowstyle[$iterator] = ''; $table->rowstyle[$iterator] = '';
if ($group['id_grupo'] != 0) { if ($group['id_grupo'] != 0) {

13
pandora_console/include/functions_groups.php
View File

@ -2122,7 +2122,7 @@ function groups_agent_disabled ($group_array) {
* @return mixed Row with html_print_table format * @return mixed Row with html_print_table format
* *
*/ */
function groups_get_group_to_list($group, $groups_count, &$symbolBranchs) { function groups_get_group_to_list($group, $groups_count, &$symbolBranchs, $has_children = false) {
$tabulation = str_repeat('    ', $group['deep']); $tabulation = str_repeat('    ', $group['deep']);
if ($group['id_grupo'] == 0) { if ($group['id_grupo'] == 0) {
@ -2160,11 +2160,16 @@ function groups_get_group_to_list($group, $groups_count, &$symbolBranchs) {
'id_group=' . $group['id_grupo'] . '">' . html_print_image("images/config.png", true, array("alt" => __('Edit'), "title" => __('Edit'), "border" => '0')); 'id_group=' . $group['id_grupo'] . '">' . html_print_image("images/config.png", true, array("alt" => __('Edit'), "title" => __('Edit'), "border" => '0'));
//Check if there is only a group to unable delete it //Check if there is only a group to unable delete it
if ($groups_count > 2) { if ($groups_count > 2) {
$confirm_message = __('Are you sure?');
if ($has_children) {
$confirm_message = __('The child groups will be updated to use the parent id of the deleted group') . ". " . $confirm_message;
}
$data[5] .= '  ' . $data[5] .= '  ' .
'<a href="index.php?sec=gagente&' . '<a href="index.php?sec=gagente&' .
'sec2=godmode/groups/group_list&' . 'sec2=godmode/groups/group_list&' .
'id_group=' . $group['id_grupo'] . '&' . 'id_group=' . $group['id_grupo'] . '&' .
'delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("alt" => __('Delete'), "border" => '0')); 'delete_group=1" onClick="if (!confirm(\' '.$confirm_message.'\')) return false;">' . html_print_image("images/cross.png", true, array("alt" => __('Delete'), "border" => '0'));
} }
else { else {
$data[5] .= '&nbsp;&nbsp;' . $data[5] .= '&nbsp;&nbsp;' .
@ -2193,7 +2198,9 @@ function groups_print_group_sons($group, $sons, &$branch_classes, $groups_count,
foreach($sons[$group['id_grupo']] as $key => $g) { foreach($sons[$group['id_grupo']] as $key => $g) {
$symbolBranchs .= ' symbol_branch_' . $g['parent']; $symbolBranchs .= ' symbol_branch_' . $g['parent'];
$data = groups_get_group_to_list($g, $groups_count, $symbolBranchs); $has_children = isset($sons[$g['id_grupo']]);
$data = groups_get_group_to_list($g, $groups_count, $symbolBranchs, $has_children);
array_push ($table->data, $data); array_push ($table->data, $data);
$branch_classes[$g['id_grupo']] = $branch_classes[$g['parent']] . ' branch_' . $g['parent']; $branch_classes[$g['id_grupo']] = $branch_classes[$g['parent']] . ' branch_' . $g['parent'];