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

2012-04-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* godmode/reporting/reporting_builder.item_editor.php: Several
	fixes on inventory reports.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5930 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-04-10 17:19:29 +00:00
parent d56ef8414b
commit c27a984e13
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-04-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/reporting_builder.item_editor.php: Several
fixes on inventory reports.
2012-04-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2012-04-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/graph_builder.graph_editor.php: Fixed display * godmode/reporting/graph_builder.graph_editor.php: Fixed display

6
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -39,6 +39,7 @@ if (enterprise_include_once ('include/functions_metaconsole.php')) {
} }
$idAgent = null; $idAgent = null;
$idAgentModule = null;
$idCustomGraph = null; $idCustomGraph = null;
$text = null; $text = null;
$header = null; $header = null;
@ -74,6 +75,9 @@ $time_from = '00:00';
$time_to = '23:59'; $time_to = '23:59';
$show_graph = 0; $show_graph = 0;
$sla_sorted_by = 0; $sla_sorted_by = 0;
$id_agents = '';
$inventory_modules = array();
$date = null;
switch ($action) { switch ($action) {
case 'new': case 'new':
@ -558,7 +562,7 @@ html_print_input_hidden('id_item', $idItem);
<td style="vertical-align: top;"><?php echo __('Date'); ?></td> <td style="vertical-align: top;"><?php echo __('Date'); ?></td>
<td style="max-width: 180px"> <td style="max-width: 180px">
<?php <?php
$dates = enterprise_hook('inventory_get_dates',array($idAgentModule, $idAgent, $id_group)); $dates = enterprise_hook('inventory_get_dates',array($idAgentModule, $idAgent, $group));
if($dates === ENTERPRISE_NOT_HOOK) { if($dates === ENTERPRISE_NOT_HOOK) {
$dates = array(); $dates = array();
} }