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

2012-05-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* godmode/reporting/reporting_builder.php: Fixed error updating 
	report items (agent and module were lost if you update item report).
	
	Merged bugfix from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6388 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-05-31 12:22:44 +00:00
parent 6895f62af4
commit b0ad1c15eb
2 changed files with 12 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 @@
2012-05-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/reporting_builder.php: Fixed error updating
report items (agent and module were lost if you update item report).
Merged bugfix from branches.
2012-05-31 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/agent_template.php: Fixed bug: adding

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

@ -428,12 +428,15 @@ switch ($action) {
$values['id_agent'] = get_parameter('id_agent');
$values['id_gs'] = get_parameter('id_custom_graph');
$values['id_agent_module'] = '';
if (isset($type)) {
if (($type == 'alert_report_agent') or ($type == 'event_report_agent'))
if (isset($values['type'])) {
if (($values['type'] == 'alert_report_agent') or ($values['type'] == 'event_report_agent'))
$values['id_agent_module'] = '';
else
$values['id_agent_module'] = get_parameter('id_agent_module');
}
else
$values['id_agent_module'] = get_parameter('id_agent_module');
$values['only_display_wrong'] = get_parameter('checkbox_only_display_wrong');
$values['monday'] = get_parameter('monday', 0);
$values['tuesday'] = get_parameter('tuesday', 0);