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

2009-10-01 Miguel de Dios <miguel.dedios@artica.es> 

* pandora_console/godmode/reporting/reporting_builder.php: change the
	agent select html for ajax autocomplete ajax. Fix in part the bug
	#2870769, exactly 1º paragraph.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1998 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2009-10-01 19:37:26 +00:00
parent 6a869a83c9
commit 26bfe1adfe
2 changed files with 96 additions and 28 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-10-01 Miguel de Dios <miguel.dedios@artica.es>
* pandora_console/godmode/reporting/reporting_builder.php: change the
agent select html for ajax autocomplete ajax. Fix in part the bug
#2870769, exactly 1º paragraph.
2009-10-01 Miguel de Dios <miguel.dedios@artica.es>
* pandora_console/godmode/alerts/alert_list.php: fix small bug that throw

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

@ -370,7 +370,11 @@ if ($edit_sla_report_content) {
$table->data[1][1] = print_select ($periods, 'period', 0, '', '--', 0, true, false, false, false);
$table->data[2][0] = __('Source agent');
$table->data[2][1] = print_select ($agents, 'id_agent', $id_agent, '', '--', 0, true);
// $table->data[2][1] = print_select ($agents, 'id_agent', $id_agent, '', '--', 0, true);
$table->data[2][1] = print_input_text_extended ('id_agent', __('Select'), 'text_id_agent', '', 30, 100, false, '',
array('style' => 'background: url(images/lightning.png) no-repeat right;'), true)
. '<a href="#" class="tip">&nbsp;<span>' . __("Type two chars at least for search") . '</span></a>';
$table->data[3][0] = __('Module');
$modules = array ();
@ -547,6 +551,8 @@ if ($edit_sla_report_content) {
}
require_jquery_file ('pandora.controls');
require_jquery_file ('bgiframe');
require_jquery_file ('autocomplete');
?>
<script language="javascript" type="text/javascript">
/* <![CDATA[ */
@ -555,32 +561,32 @@ function refresh_table () {
$('#table-add-item > tbody > tr:even td').removeClass('datos').addClass('datos2');
}
function agent_changed () {
var id_agent = this.value;
$('#id_module').fadeOut ('normal', function () {
$('#id_module').empty ();
var inputs = [];
inputs.push ("id_agent=" + id_agent);
inputs.push ("get_agent_modules_json=1");
inputs.push ("page=operation/agentes/ver_agente");
inputs.push ("filter=delete_pending%3Dfalse");
jQuery.ajax ({
data: inputs.join ("&"),
type: 'GET',
url: "ajax.php",
timeout: 10000,
dataType: 'json',
success: function (data) {
$('#id_module').append ($('<option></option>').attr ('value', 0).text ("--"));
jQuery.each (data, function (i, val) {
s = html_entity_decode (val['nombre']);
$('#id_module').append ($('<option></option>').attr ('value', val['id_agente_modulo']).text (s.toLowerCase()));
});
$('#id_module').fadeIn ('normal');
}
});
});
}
//function agent_changed () {
// var id_agent = this.value;
// $('#id_module').fadeOut ('normal', function () {
// $('#id_module').empty ();
// var inputs = [];
// inputs.push ("id_agent=" + id_agent);
// inputs.push ("get_agent_modules_json=1");
// inputs.push ("page=operation/agentes/ver_agente");
// inputs.push ("filter=delete_pending%3Dfalse");
// jQuery.ajax ({
// data: inputs.join ("&"),
// type: 'GET',
// url: "ajax.php",
// timeout: 10000,
// dataType: 'json',
// success: function (data) {
// $('#id_module').append ($('<option></option>').attr ('value', 0).text ("--"));
// jQuery.each (data, function (i, val) {
// s = html_entity_decode (val['nombre']);
// $('#id_module').append ($('<option></option>').attr ('value', val['id_agente_modulo']).text (s.toLowerCase()));
// });
// $('#id_module').fadeIn ('normal');
// }
// });
// });
//}
var previous_report_type;
@ -629,7 +635,63 @@ function report_type_changed () {
}
$(document).ready (function () {
$('#id_agent').change (agent_changed);
$("#text_id_agent").autocomplete(
"ajax.php",
{
minChars: 2,
scroll:true,
extraParams: {
page: "operation/agentes/exportdata",
search_agents: 1,
id_group: function() { return $("#id_group").val(); }
},
formatItem: function (data, i, total) {
if (total == 0)
$("#text_id_agent").css ('background-color', '#cc0000');
else
$("#text_id_agent").css ('background-color', '');
if (data == "")
return false;
return data[0]+'<br><span class="ac_extra_field"><?php echo __("IP") ?>: '+data[1]+'</span>';
},
delay: 200
}
);
$("#text_id_agent").result (
function () {
var agent_name = this.value;
$('#id_module').fadeOut ('normal', function () {
$('#id_module').empty ();
var inputs = [];
inputs.push ("agent_name=" + agent_name);
inputs.push ("get_agent_modules_json=1");
inputs.push ("page=operation/agentes/ver_agente");
jQuery.ajax ({
data: inputs.join ("&"),
type: 'GET',
url: "ajax.php",
timeout: 10000,
dataType: 'json',
success: function (data) {
$('#id_module').append ($('<option></option>').attr ('value', 0).text ("--"));
jQuery.each (data, function (i, val) {
s = html_entity_decode (val['nombre']);
$('#id_module').append ($('<option></option>').attr ('value', val['id_agente_modulo']).text (s.toLowerCase()));
});
$('#id_module').fadeIn ('normal');
}
});
});
}
);
//----------------------------
//$('#id_agent').change (agent_changed);
$('#type').change (report_type_changed);
$('#report_id_group').pandoraSelectGroupAgent ();
});