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

2012-04-02 Sergio Martin <sergio.martin@artica.es> 

* include/functions_reporting.php
	include/functions.php: Fixed little bugs
	of the inventory reports and translation strings

	* operation/reporting/reporting_viewer.php: Added fixed
	configuration line of the pickdate jquery control



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5862 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-04-02 09:43:58 +00:00
parent c96cfbb9f6
commit b9557f1cb1
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2012-04-02 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php
include/functions.php: Fixed little bugs
of the inventory reports and translation strings
* operation/reporting/reporting_viewer.php: Added fixed
configuration line of the pickdate jquery control
2012-04-02 Dario Rodriguez <dario.rodriguez@artica.es> 2012-04-02 Dario Rodriguez <dario.rodriguez@artica.es>
*operation/visual_console/render_view.php, *operation/visual_console/render_view.php,

2
pandora_console/include/functions.php
View File

@ -812,7 +812,7 @@ function get_event_types () {
$types['recon_host_detected'] = __('Recon host detected'); $types['recon_host_detected'] = __('Recon host detected');
$types['system'] = __('System'); $types['system'] = __('System');
$types['error'] = __('Error'); $types['error'] = __('Error');
$types['configuration_change'] = __('configuration change '); $types['configuration_change'] = __('Configuration change ');
if (isset($config['text_char_long'])) { if (isset($config['text_char_long'])) {
foreach ($types as $key => $type) { foreach ($types as $key => $type) {

3
pandora_console/include/functions_reporting.php
View File

@ -3646,6 +3646,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$avg = $avg / $length; $avg = $avg / $length;
} }
unset($table_summary); unset($table_summary);
$table_summary->width = '99%'; $table_summary->width = '99%';
@ -4434,7 +4435,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
array_push ($table->data, $data); array_push ($table->data, $data);
} }
$inventory_data = inventory_get_data((array)$id_agent,0,$date,'',false,(array)$module_name); $inventory_data = inventory_get_data((array)$id_agent,(array)$module_name,$date,'',false);
if ($inventory_data == ERR_NODATA) { if ($inventory_data == ERR_NODATA) {
$inventory_data = "<div class='nf'>".__('No data found.')."</div>"; $inventory_data = "<div class='nf'>".__('No data found.')."</div>";

1
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -159,6 +159,7 @@ ui_require_jquery_file ('timeentry');
$(document).ready (function () { $(document).ready (function () {
$("#loading").slideUp (); $("#loading").slideUp ();
$("#text-time").timeEntry ({spinnerImage: 'images/time-entry.png', spinnerSize: [20, 20, 0]}); $("#text-time").timeEntry ({spinnerImage: 'images/time-entry.png', spinnerSize: [20, 20, 0]});
$.datepicker.setDefaults($.datepicker.regional[ "<?php echo $config['language']; ?>"]);
$("#text-date").datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"}); $("#text-date").datepicker ({changeMonth: true, changeYear: true, showAnim: "slideDown"});
}); });
</script> </script>