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

2012-11-13 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* godmode/reporting/reporting_builder.php,
	godmode/reporting/reporting_builder.item_editor.php,
	include/functions_ui.php: fixed the javascript urls.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7146 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-11-13 19:08:41 +00:00
parent 05ac3763aa
commit c98fbb2c65
4 changed files with 128 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-11-13 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php,
godmode/reporting/reporting_builder.item_editor.php,
include/functions_ui.php: fixed the javascript urls.
2012-11-13 Miguel de Dios <miguel.dedios@artica.es> 2012-11-13 Miguel de Dios <miguel.dedios@artica.es>
* include/db/mysql.php, include/functions_reporting.php, * include/db/mysql.php, include/functions_reporting.php,

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

@ -359,11 +359,11 @@ switch ($action) {
$resolution = $item ['top_n']; // Interval resolution $resolution = $item ['top_n']; // Interval resolution
$max_values = $item ['top_n_value']; // Max values $max_values = $item ['top_n_value']; // Max values
break; break;
} }
//Restore db connection //Restore db connection
if (($config ['metaconsole'] == 1) && ($server_name != '') && defined('METACONSOLE')) { if (($config ['metaconsole'] == 1) && ($server_name != '')
&& defined('METACONSOLE')) {
metaconsole_restore_db(); metaconsole_restore_db();
} }
@ -618,6 +618,8 @@ html_print_input_hidden('id_item', $idItem);
<td> <td>
<?php <?php
$agents = enterprise_hook('inventory_get_agents'); $agents = enterprise_hook('inventory_get_agents');
if ((empty($agents)) || $agents == -1) $agents = array();
$agents_select = array(); $agents_select = array();
foreach($agents as $a) { foreach($agents as $a) {
$agents_select[$a['id_agente']] = $a['nombre']; $agents_select[$a['id_agente']] = $a['nombre'];
@ -951,6 +953,9 @@ function print_SLA_list($width, $action, $idItem = null) {
$params['add_none_module'] = false; $params['add_none_module'] = false;
$params['use_input_server'] = true; $params['use_input_server'] = true;
$params['input_server_id'] = 'hidden-server_name'; $params['input_server_id'] = 'hidden-server_name';
if (defined('METACONSOLE')) {
$params['disabled_javascript_on_blur_function'] = true;
}
ui_print_agent_autocomplete_input($params); ui_print_agent_autocomplete_input($params);
?> ?>
<td><select id="id_agent_module_sla" name="id_agente_modulo_sla" disabled="disabled" style="max-width: 180px"><option value="0"><?php echo __('Select an Agent first'); ?></option></select></td> <td><select id="id_agent_module_sla" name="id_agente_modulo_sla" disabled="disabled" style="max-width: 180px"><option value="0"><?php echo __('Select an Agent first'); ?></option></select></td>
@ -1059,6 +1064,9 @@ function print_General_list($width, $action, $idItem = null) {
$params['add_none_module'] = false; $params['add_none_module'] = false;
$params['use_input_server'] = true; $params['use_input_server'] = true;
$params['input_server_id'] = 'hidden-server_name_general'; $params['input_server_id'] = 'hidden-server_name_general';
if (defined('METACONSOLE')) {
$params['disabled_javascript_on_blur_function'] = true;
}
ui_print_agent_autocomplete_input($params); ui_print_agent_autocomplete_input($params);
?> ?>
</td> </td>

10
pandora_console/include/functions_ui.php
View File

@ -1017,7 +1017,12 @@ function ui_require_javascript_file ($name, $path = 'include/javascript/') {
if (! file_exists ($filename) && ! file_exists ($config['homedir'].'/'.$filename)) if (! file_exists ($filename) && ! file_exists ($config['homedir'].'/'.$filename))
return false; return false;
if (defined('METACONSOLE')) {
$config['js'][$name] = "../../" . $filename;
}
else {
$config['js'][$name] = $filename; $config['js'][$name] = $filename;
}
return true; return true;
} }
@ -1089,7 +1094,12 @@ function ui_require_jquery_file ($name, $path = 'include/javascript/') {
if (! file_exists ($filename) && ! file_exists ($config['homedir'].'/'.$filename)) if (! file_exists ($filename) && ! file_exists ($config['homedir'].'/'.$filename))
return false; return false;
if (defined('METACONSOLE')) {
$config['jquery'][$name] = "../../" . $filename;
}
else {
$config['jquery'][$name] = $filename; $config['jquery'][$name] = $filename;
}
return true; return true;
} }