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

2009-09-16 Miguel de Dios <miguel.dedios@artica.es> 

* operation/agentes/estado_agente.php, godmode/alerts/alert_list.php: fix
	bug when there aren't not defined or attach action in template alert. Before
	it was showing the loading ajax gif, now it show the select box with none.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1950 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2009-09-16 15:38:44 +00:00
parent 30c99f70cc
commit 09b43fb34a
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2009-09-16 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/estado_agente.php, godmode/alerts/alert_list.php: fix
bug when there aren't not defined or attach action in template alert. Before
it was showing the loading ajax gif, now it show the select box with none.
2009-09-16 Miguel de Dios <miguel.dedios@artica.es> 2009-09-16 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php, include/functions_agents.php: cleanup * include/functions_reporting.php, include/functions_agents.php: cleanup

17
pandora_console/godmode/alerts/alert_list.php
View File

@ -724,6 +724,15 @@ $(document).ready (function () {
"id_template" : this.value "id_template" : this.value
}, },
function (data, status) { function (data, status) {
option = $("<option></option>")
.attr ("value", '0')
.append ('<?php echo __('None'); ?>');
$("#action_select").append (option);
if (data == false) {
//There aren't any action
}
else {
if (data != '') { if (data != '') {
jQuery.each (data, function (i, val) { jQuery.each (data, function (i, val) {
option = $("<option></option>") option = $("<option></option>")
@ -732,14 +741,10 @@ $(document).ready (function () {
$("#action_select").append (option); $("#action_select").append (option);
}); });
} }
option = $("<option></option>") $('#advanced_action').show();
.attr ("value", '0') }
.append ('<?php echo __('None'); ?>');
$("#action_select").append (option);
$("#action_loading").hide (); $("#action_loading").hide ();
$("#action_select").show(); $("#action_select").show();
$('#advanced_action').show();
}, },
"json" "json"
); );

5
pandora_console/operation/agentes/estado_agente.php
View File

@ -42,9 +42,10 @@ if (is_ajax ()) {
ORDER BY sort_order DESC"); ORDER BY sort_order DESC");
if ($rows !== false) { if ($rows !== false)
echo json_encode($rows); echo json_encode($rows);
} else
echo "false";
return; return;
} }