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

Merge branch '811-massive-operations-error-verbosity-dev' into 'develop' 

Added more specified alert to update modules and agents when no one field change

See merge request !458
This commit is contained in:
vgilc 2017-05-31 17:37:43 +02:00
parent 61a9d923a4 1f4b7fddc0
commit d493151527
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/massive/massive_edit_agents.php
View File

@ -183,7 +183,7 @@ if ($update_agents) {
ui_print_result_message ($result !== false,
__('Agents updated successfully') . '(' . $n_edited . ')',
__('Agents cannot be updated'));
__('Agents cannot be updated (maybe there was no field to update)'));
}
$id_group = 0;

11
pandora_console/godmode/massive/massive_edit_modules.php
View File

@ -110,6 +110,9 @@ if ($update) {
$success += (int)$result;
}
}
if ($success == 0) {
$error_msg = __("Error updating the modules from a module type");
}
}
else if ($force == 'group') {
$agents_ = array_keys(agents_get_group_agents($group_select, false, 'none'));
@ -129,6 +132,9 @@ if ($update) {
$success += (int)$result;
}
}
if ($success == 0) {
$error_msg = __("Error updating the modules from an agent group");
}
}
}
else {
@ -146,11 +152,14 @@ if ($update) {
}
}
if ($success == 0) {
$error_msg = __("Error updating the modules (maybe there was no field to update)");
}
}
ui_print_result_message ($success > 0,
__('Successfully updated') . "(" . $success . "/" . $count . ")",
__('Could not be updated'));
$error_msg);
$info = 'Modules: ' . json_encode($modules_) . ' Agents: ' . json_encode($agents_);
if ($success > 0) {