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

2011-09-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/javascript/jquery.pandora.controls.js: Filter keycount variable
        in pandoraSelectGroupAgent javascript function.
        * godmode/massive/massive_add_action_alerts.php: Added 'Any' label to
        agents combo in this view and correct a typo.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4870 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-09-01 11:14:46 +00:00
parent b9c9a6f577
commit a2def9d355
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2011-09-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/javascript/jquery.pandora.controls.js: Filter keycount variable
in pandoraSelectGroupAgent javascript function.
* godmode/massive/massive_add_action_alerts.php: Added 'Any' label to
agents combo in this view and correct a typo.
2011-09-01 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/ver_agente.php: fixed the massive deletion alerts with

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

@ -117,7 +117,7 @@ if ($add) {
$results = false;
}
db_pandora_audit("Masive management", "Add alert action " . $id_agent, false, false, 'Agents: ' .
db_pandora_audit("Masive management", "Add alert action " . json_encode($id_agents), false, false, 'Agents: ' .
json_encode($id_agents) . ' Alerts : ' . json_encode($agent_alerts) .
' Fires Min: ' . $fires_min . ' Fires Max: ' . $fires_max . ' Action: ' . $action);
@ -153,7 +153,7 @@ $table->data[1][0] .= '<span id="agent_loading" class="invisible">';
$table->data[1][0] .= html_print_image('images/spinner.png', true);
$table->data[1][0] .= '</span>';
$table->data[1][1] = html_print_select (agents_get_group_agents ($id_group, false, "none"),
'id_agents[]', 0, false, '', '', true, true);
'id_agents[]', 0, false, __('Any'), '', true, true);
if (empty($id_agents)) {
$alert_templates = '';

14
pandora_console/include/javascript/jquery.pandora.controls.js
View File

@ -39,12 +39,14 @@
},
function (data, status) {
jQuery.each (data, function (id, value) {
config.callbackPre ();
option = $("<option></option>")
.attr ("value", id)
.html (value);
config.callbackPost (id, value, option);
$(config.agentSelect).append (option);
if (id !== 'keycount'){
config.callbackPre ();
option = $("<option></option>")
.attr ("value", id)
.html (value);
config.callbackPost (id, value, option);
$(config.agentSelect).append (option);
}
});
$(config.loading).hide ();
$select.enable ();