tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* include/functions_reporting.php
	 include/javascript/pandora.js
	 include/functions_ui.php: Fixes in global, exception and sla
	 metaconsole reports.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6945 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-09-10 13:38:05 +00:00
parent 260689166b
commit b391b9f1de
4 changed files with 15 additions and 5 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-09-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php
include/javascript/pandora.js
include/functions_ui.php: Fixes in global, exception and sla
metaconsole reports.
2012-09-10 Sergio Martin <sergio.martin@artica.es> 2012-09-10 Sergio Martin <sergio.martin@artica.es>
* ChangeLog: Updated the changelog with * ChangeLog: Updated the changelog with

2
pandora_console/include/functions_reporting.php
View File

@ -4166,7 +4166,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$height = count($data_pie_graph)*20+35; $height = count($data_pie_graph)*20+35;
$data = array(); $data = array();
$data[0] = hbar_graph(false, $data_hbar, 600, $height, array(), array(), "", "", true, "", $config['homedir'] . "/images/logo_vertical_water.png", '', '', true, 1, true); $data[0] = hbar_graph(false, $data_hbar, 600, $height, array(), array(), "", "", true, $config['homeurl'] . "/", $config['homedir'] . "/images/logo_vertical_water.png", '', '', true, 1, true);
array_push ($table->data, $data); array_push ($table->data, $data);
} }

7
pandora_console/include/functions_ui.php
View File

@ -1980,8 +1980,11 @@ function ui_get_full_url ($url = '', $no_proxy = false, $add_name_php_file = fal
} }
// using a different port than the standard // using a different port than the standard
if ( $port != null ) { if (!$proxy) {
$fullurl .= ":" . $port; // using a different port than the standard
if ( $port != null ) {
$fullurl .= ":" . $port;
}
} }
if ($url === '') { if ($url === '') {

4
pandora_console/include/javascript/pandora.js
View File

@ -463,7 +463,7 @@ function agent_module_autocomplete (id_agent_name, id_agent_id, id_agent_module_
data: data_params, data: data_params,
async: false, async: false,
type: 'POST', type: 'POST',
url: action= homedir + "/ajax.php", url: action= homedir_path + "/ajax.php",
timeout: 10000, timeout: 10000,
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {
@ -509,7 +509,7 @@ function agent_module_autocomplete (id_agent_name, id_agent_id, id_agent_module_
jQuery.ajax ({ jQuery.ajax ({
data: data_params, data: data_params,
type: 'POST', type: 'POST',
url: action= homedir + "/ajax.php", url: action= homedir_path + "/ajax.php",
timeout: 10000, timeout: 10000,
dataType: 'json', dataType: 'json',
success: function (data) { success: function (data) {