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

2010-04-26 Miguel de Dios <miguel.dedios@artica.es> 

* operation/agentes/ver_agente.php: removed hack for translate "any" text.
	
	* godmode/reporting/graph_builder.php: removed unused javascript function
	"agent_changed"
	
	* godmode/reporting/reporting_builder.php: re-added parameter
	$values['id_agent_module'].


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2612 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-04-27 07:35:50 +00:00
parent d05a350141
commit fe7656b4d0
4 changed files with 13 additions and 29 deletions
pandora_console
ChangeLog
godmode/reporting
graph_builder.phpreporting_builder.php
operation/agentes
ver_agente.php

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2010-04-26 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/ver_agente.php: removed hack for translate "any" text.
* godmode/reporting/graph_builder.php: removed unused javascript function
"agent_changed"
* godmode/reporting/reporting_builder.php: re-added parameter
$values['id_agent_module'].
2010-04-26 Sancho Lerena <slerena@ærtica.es>
* operation/agentes/datos_agente.php: Fixed the data table render

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

@ -659,34 +659,6 @@ require_jquery_file ('autocomplete');
?>
<script language="javascript" type="text/javascript">
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 ('filter=delete_pending = 0');
inputs.push ("get_agent_modules_json=1");
inputs.push ("page=operation/agentes/ver_agente");
jQuery.ajax ({
data: inputs.join ("&"),
type: 'GET',
url: action="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 = js_html_entity_decode (val['nombre']);
$('#id_module').append ($('<option></option>').attr ('value', val['id_agente_modulo']).text (s));
});
$('#id_module').fadeIn ('normal');
}
});
});
}
$(document).ready (function () {
//$('#id_agent').change (agent_changed);

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

@ -168,6 +168,7 @@ switch ($action) {
$values['id_agent'] = get_parameter('id_agent');
$values['id_gs'] = get_parameter('id_custom_graph');
$values['text'] = get_parameter('text');
$values['id_agent_module'] = get_parameter('id_agente_modulo');
if ($values['type'] == 'sql') {
$values['treport_custom_sql_id'] = get_parameter('id_custom');
@ -194,6 +195,7 @@ switch ($action) {
$values['id_agent'] = get_parameter('id_agent');
$values['id_gs'] = get_parameter('id_custom_graph');
$values['text'] = get_parameter('text');
$values['id_agent_module'] = get_parameter('id_agente_modulo');
if ($values['type'] == 'sql') {
$values['treport_custom_sql_id'] = get_parameter('id_custom');

2
pandora_console/operation/agentes/ver_agente.php
View File

@ -88,7 +88,7 @@ if (is_ajax ()) {
($filter != '' ? $filter : false), $indexed);
//Hack to translate text "any" in PHP to javascript
$agent_modules['any_text'] = __('Any');
//$agent_modules['any_text'] = __('Any');
echo json_encode ($agent_modules);
return;