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

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

* godmode/agentes/module_manager_editor_prediction.php: Fixed bug
	in prediction modules editor.
	
	Merged from braches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7385 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2013-01-09 10:35:10 +00:00
parent 06b8dca841
commit cf7d73a338
2 changed files with 18 additions and 2 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 @@
2013-01-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/module_manager_editor_prediction.php: Fixed bug
in prediction modules editor.
Merged from braches.
2013-01-09 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql

13
pandora_console/godmode/agentes/module_manager_editor_prediction.php
View File

@ -116,14 +116,23 @@ $params['use_hidden_input_idagent'] = true;
$params['hidden_input_idagent_id'] = 'hidden-id_agente';
$data[1] .= ui_print_agent_autocomplete_input($params);
// Get module and agent of the target prediction module
if (!empty($prediction_module)) {
$id_agente_clean = modules_get_agentmodule_agent($prediction_module);
$prediction_module_agent = modules_get_agentmodule_agent_name($prediction_module);
$agent_name_clean = $prediction_module_agent;
}
else {
$id_agente_clean = $id_agente;
$agent_name_clean = $agent_name;
}
$data[1] .= html_print_label(__("Module"),'prediction_module',true);
if($id_agente) {
$sql = "SELECT id_agente_modulo, nombre
FROM tagente_modulo
WHERE delete_pending = 0
AND history_data = 1 AND id_agente = ".$id_agente;
AND history_data = 1 AND id_agente = " . $id_agente_clean . " AND id_agente_modulo <> " . $id_agente_modulo;
$data[1] .= html_print_select_from_sql($sql, 'prediction_module', $prediction_module, false, __('Select Module'), 0, true);
}
else {