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

Merge branch 'ent-3338-Bulk-operations-Module-operations' into 'develop' 

Changed the order of actions

See merge request artica/pandorafms!2139

Former-commit-id: 13b7155ec497027e521f3a9b2147b9e24692e0db
This commit is contained in:
Alejandro Fraguas 2019-02-04 11:22:43 +01:00
parent 74d9b18c87 0a94ac9eb0
commit ec97e54dec
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/godmode/massive/massive_operations.php
View File

@ -57,9 +57,9 @@ if (check_acl($config['id_user'], 0, 'PM')) {
} }
$options_modules = [ $options_modules = [
'delete_modules' => __('Bulk module delete'),
'edit_modules' => __('Bulk module edit'), 'edit_modules' => __('Bulk module edit'),
'copy_modules' => __('Bulk module copy'), 'copy_modules' => __('Bulk module copy'),
'delete_modules' => __('Bulk module delete'),
]; ];
$options_plugins = [ $options_plugins = [
@ -79,7 +79,7 @@ if ($policies_options != ENTERPRISE_NOT_HOOK) {
$options_snmp = []; $options_snmp = [];
$snmp_options = enterprise_hook('massive_snmp_options'); $snmp_options = enterprise_hook('massive_snmp_options');
$snmp_options = array_reverse($snmp_options);
if ($snmp_options != ENTERPRISE_NOT_HOOK) { if ($snmp_options != ENTERPRISE_NOT_HOOK) {
$options_snmp = array_merge($options_snmp, $snmp_options); $options_snmp = array_merge($options_snmp, $snmp_options);
} }
@ -384,4 +384,3 @@ switch ($option) {
} }
break; break;
} }