tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-25 23:05:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* godmode/reporting/reporting_builder.php,
	godmode/reporting/graph_builder.php, godmode/alerts/alert_list.php: fix the
	bug that show the modules "pending delete" in more select box in some forms.
	Fixes: 2894921



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2109 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2009-11-16 19:02:49 +00:00
parent 6586957f8d
commit 75d56d8d2b
4 changed files with 13 additions and 18 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 @@
2009-11-16 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php,
godmode/reporting/graph_builder.php, godmode/alerts/alert_list.php: fix the
bug that show the modules "pending delete" in more select box in some forms.
Fixes: 2894921
2009-11-12 Miguel de Dios <miguel.dedios@artica.es> 2009-11-12 Miguel de Dios <miguel.dedios@artica.es>
* godmode/db/db_sanity.php: fix typo error there was one "zero" more in * godmode/db/db_sanity.php: fix typo error there was one "zero" more in

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

@ -494,7 +494,8 @@ if (! $id_agente) {
$table->data[0][0] = __('Module'); $table->data[0][0] = __('Module');
$modules = array (); $modules = array ();
if ($id_agente) if ($id_agente)
$modules = get_agent_modules ($id_agente); $modules = get_agent_modules ($id_agente, false, array("delete_pending" => 0));
$table->data[0][1] = print_select ($modules, 'id_agent_module', 0, true, $table->data[0][1] = print_select ($modules, 'id_agent_module', 0, true,
__('Select'), 0, true, false, true, '', ($id_agente == 0)); __('Select'), 0, true, false, true, '', ($id_agente == 0));
$table->data[0][1] .= ' <span id="latest_value" class="invisible">'.__('Latest value').': '; $table->data[0][1] .= ' <span id="latest_value" class="invisible">'.__('Latest value').': ';
@ -510,23 +511,6 @@ $table->data[1][1] .= ' <a class="template_details invisible" href="#">
<img class="img_help" src="images/zoom.png" /></a>'; <img class="img_help" src="images/zoom.png" /></a>';
$table->data[2][0] = __('Actions'); $table->data[2][0] = __('Actions');
//$actions = get_alert_actions ();
//if (empty ($actions))
// $actions = array ();
//foreach ($actions as $action_id => $action_name) {
// $id = 'actions['.$action_id.']';
// $table->data[2][1] .= print_checkbox ($id, $action_id, false, true);
// $table->data[2][1] .= print_label ($action_name, 'checkbox-'.$id, true);
// $table->data[2][1] .= ' <span id="advanced_'.$action_id.'" class="advanced_actions invisible">';
// $table->data[2][1] .= __('From').' ';
// $table->data[2][1] .= print_input_text ('fires_min['.$action_id.']', -1, '', 4, 10, true);
// $table->data[2][1] .= ' '.__('to').' ';
// $table->data[2][1] .= print_input_text ('fires_max['.$action_id.']', -1, '', 4, 10, true);
// $table->data[2][1] .= ' '.__('matches of the alert');
// $table->data[2][1] .= '</span>';
// $table->data[2][1] .= '<br />';
//}
$actions = array ('0' => __('None')); $actions = array ('0' => __('None'));
@ -615,6 +599,7 @@ $(document).ready (function () {
$('#id_agent_module').empty (); $('#id_agent_module').empty ();
var inputs = []; var inputs = [];
inputs.push ("agent_name=" + agent_name); inputs.push ("agent_name=" + agent_name);
inputs.push ('filter=delete_pending = 0');
inputs.push ("get_agent_modules_json=1"); inputs.push ("get_agent_modules_json=1");
inputs.push ("page=operation/agentes/ver_agente"); inputs.push ("page=operation/agentes/ver_agente");
jQuery.ajax ({ jQuery.ajax ({

2
pandora_console/godmode/reporting/graph_builder.php
View File

@ -665,6 +665,7 @@ function agent_changed () {
$('#id_module').empty (); $('#id_module').empty ();
var inputs = []; var inputs = [];
inputs.push ("id_agent=" + id_agent); inputs.push ("id_agent=" + id_agent);
inputs.push ('filter=delete_pending = 0');
inputs.push ("get_agent_modules_json=1"); inputs.push ("get_agent_modules_json=1");
inputs.push ("page=operation/agentes/ver_agente"); inputs.push ("page=operation/agentes/ver_agente");
jQuery.ajax ({ jQuery.ajax ({
@ -721,6 +722,7 @@ $(document).ready (function () {
$('#id_module').empty (); $('#id_module').empty ();
var inputs = []; var inputs = [];
inputs.push ("agent_name=" + agent_name); inputs.push ("agent_name=" + agent_name);
inputs.push ('filter=delete_pending = 0');
inputs.push ("get_agent_modules_json=1"); inputs.push ("get_agent_modules_json=1");
inputs.push ("page=operation/agentes/ver_agente"); inputs.push ("page=operation/agentes/ver_agente");
jQuery.ajax ({ jQuery.ajax ({

1
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -679,6 +679,7 @@ $(document).ready (function () {
$('#id_module').empty (); $('#id_module').empty ();
var inputs = []; var inputs = [];
inputs.push ("agent_name=" + agent_name); inputs.push ("agent_name=" + agent_name);
inputs.push ('filter=delete_pending = 0');
inputs.push ("get_agent_modules_json=1"); inputs.push ("get_agent_modules_json=1");
inputs.push ("page=operation/agentes/ver_agente"); inputs.push ("page=operation/agentes/ver_agente");
jQuery.ajax ({ jQuery.ajax ({