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

Fixed bulk deleted action alerts. Tiquet: #3268 

(cherry picked from commit aac2460c85)
This commit is contained in:
m-lopez-f 2016-01-28 09:45:33 +01:00
parent ab33459d52
commit a837e110d0
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ if (is_ajax ()) {
}
else {
$agents = agents_get_group_agents($id_group, $filter, "none",
false, $recursion);
false, $recursion, false, '|', $add_alert_bulk_op);
}
// Add keys prefix

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

@ -211,7 +211,7 @@ $(document).ready (function () {
var recursion;
$("#checkbox-recursion").click(function () {
recursion = this.checked ? 1 : 0;
recursion = this.checked;
$("#id_group").trigger("change");
});

23
pandora_console/godmode/massive/massive_delete_action_alerts.php
View File

@ -139,7 +139,8 @@ $table->data[0][0] = __('Group');
$table->data[0][1] = html_print_select_groups(false, "AW", $return_all_group, 'id_group', $id_group,
false, '', '', true);
$table->data[0][2] = __('Group recursion');
$table->data[0][3] = html_print_checkbox ("recursion", 1, $recursion, true, false);
$table->data[0][3] = html_print_checkbox ("recursion", 1, $recursion,
true, false);
$table->data[1][0] = __('Agents with templates');
$table->data[1][0] .= '<span id="agent_loading" class="invisible">';
@ -167,7 +168,7 @@ $table->data[3][1] = html_print_select ($actions, 'action[]', '', '',
echo '<form method="post" id="form_alert" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_action_alerts">';
html_print_table ($table);
$sql = 'SELECT id_agente
$sql = 'SELECT DISTINCT(id_agente)
FROM tagente_modulo
WHERE id_agente_modulo IN (
SELECT id_agent_module
@ -179,7 +180,7 @@ foreach($agents_with_templates as $ag) {
}
$agents_with_templates_json = json_encode($agents_with_templates_json);
echo "<input type='hidden' id='hidden-agents_with_templates' value='$agents_with_templates_json'>";
echo "<input type='hidden' id='hidden-agents_with_templates' value='".$agents_with_templates_json."'>";
echo '<div class="action-buttons" style="width: '.$table->width.'" onsubmit="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
html_print_input_hidden ('delete', 1);
@ -197,23 +198,23 @@ ui_require_jquery_file('pandora.controls');
$(document).ready (function () {
update_alerts();
var recursion;
$("#checkbox-recursion").click(function () {
recursion = this.checked ? 1 : 0;
$("#id_group").trigger("change");
});
var filter_agents_json = $("#hidden-agents_with_templates").val();
var recursion = false;
$("#checkbox-recursion").click(function () {
recursion = this.checked;
$("#id_group").trigger("change");
});
$("#id_group").pandoraSelectGroupAgent ({
agentSelect: "select#id_agents",
privilege: "AW",
recursion: function() {return recursion},
filter_agents_json: filter_agents_json,
add_alert_bulk_op: true,
callbackPost: function () {
var $select_template = $("#id_alert_templates").disable ();
$("option", $select_template).remove ();
}
},
recursion: function() {return recursion}
});
$("#id_agents").change (function () {

2
pandora_console/include/functions_agents.php
View File

@ -192,7 +192,7 @@ function agents_get_alerts_simple ($id_agent = false, $filter = '', $options = f
}
}
}
else if ($id_agent === false) {
else if ($id_agent === false || empty($id_agent)) {
if ($allModules)
$disabled = '';
else