diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5f2578df74..db084a5191 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2012-11-02 Miguel de Dios + + * include/functions_reporting.php, extensions/update_manager.php: + cleaned source code style. + + * include/functions_ui.php: fixed or improved the function + "ui_print_agent_autocomplete_input" for to get the data when the + user stop to typing and lost the focus this widget. + + Fixes: #3573762 + 2012-11-02 Vanessa Gil * operation/reporting/reporting_xml.php: Removed html entities. diff --git a/pandora_console/extensions/update_manager.php b/pandora_console/extensions/update_manager.php index 00876b0948..a1b514f8a5 100644 --- a/pandora_console/extensions/update_manager.php +++ b/pandora_console/extensions/update_manager.php @@ -38,7 +38,7 @@ if (is_ajax ()) { return; } - + if ($get_license_info) { enterprise_include_once('include/functions_license.php'); diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 0276f5dffc..48b3fd32a5 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -4509,7 +4509,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f $data[3] = ''.__('IP').''; $data[4] = ''.__('Description').''; $data[5] = ''.__('Status').''; - + $table->colspan[1][3] = 2; $table->colspan[1][4] = 4; $table->colspan[1][5] = 2; @@ -4530,7 +4530,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f $data[5] = __('Enabled'); else $data[5] = __('Disabled'); - + $table->colspan[2][3] = 2; $table->colspan[2][4] = 4; $table->colspan[2][5] = 2; @@ -4639,7 +4639,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f $table->colspan[$i][4] = 4; $table->colspan[$i][5] = 2; $table->colspan[$i][5] = 2; - + $i++; //Agent's data diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 8a83c70d62..cb3248b609 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -2416,7 +2416,7 @@ function ui_print_agent_autocomplete_input($parameters) { } // Javascript configurations - //----------------------------------------- + //------------------------------------------------------------------ $javascript_ajax_page = 'ajax.php'; //Default value if (isset($parameters['javascript_ajax_page'])) { $javascript_ajax_page = $parameters['javascript_ajax_page']; @@ -2486,8 +2486,8 @@ function ui_print_agent_autocomplete_input($parameters) { } if ((' . ((int)$print_hidden_input_idagent) . ') - || (' . ((int)$use_hidden_input_idagent) . ')) { - + || (' . ((int)$use_hidden_input_idagent) . ')) { + inputs.push ("id_agent=" + $("#' . $hidden_input_idagent_id . '").val()); } @@ -2659,7 +2659,8 @@ function ui_print_agent_autocomplete_input($parameters) { //Set icon $("#' . $input_id . '") - .css("background","url(\"' . $icon_image . '\") right center no-repeat"); + .css("background", + "url(\"' . $icon_image . '\") right center no-repeat"); return; } @@ -2749,12 +2750,106 @@ function ui_print_agent_autocomplete_input($parameters) { $javascript_tags = $parameters['javascript_tags']; } + $javascript_on_blur_function_name = 'function_on_blur_' . $input_name;//Default value + if (isset($parameters['javascript_on_blur_function_name'])) { + $javascript_on_blur_function_name = $parameters['javascript_on_blur_function_name']; + } + + //Default value + $javascript_on_blur = ' + /* + This function is a callback when the autocomplete agent + input lost the focus. + */ + function ' . $javascript_on_blur_function_name . '() { + //Set loading + $("#' . $input_id . '") + .css("background", + "url(\"' . $spinner_image . '\") right center no-repeat"); + + input_value = $("#' . $input_id . '").val(); + + var term = input_value; //Word to search + + var data_params = {"page": "include/ajax/agent", + "search_agents_2": 1, + "id_group": 0, + "q": term}; + + jQuery.ajax ({ + data: data_params, + async: false, + type: "POST", + url: action="' . $javascript_ajax_page . '", + timeout: 10000, + dataType: "json", + success: function (data) { + if (data.length == 0) { + alert("' . __('Does not exist agent with this name.') . '"); + + //Set icon + $("#' . $input_id . '") + .css("background", + "url(\"' . $icon_image . '\") right center no-repeat"); + + return; + } + + var agent_name = data[0].name; + var agent_id = data[0].id; + var server_name; + + if (' . ((int)$metaconsole_enabled) . ') { + server_name = data[0].server; + } + else { + server_name = data[0].ip; + } + + if ((' . ((int)$print_hidden_input_idagent) . ') + || (' . ((int)$use_hidden_input_idagent) . ')) { + $("#' . $hidden_input_idagent_id . '").val(agent_id); + } + + //Put the server id into the hidden input + if ((' . ((int)$use_input_server) . ') + || (' . ((int)$print_input_server) . ')) { + $("#' . $input_server_id . '").val(server_name); + } + + //Call the function to select (example fill the modules) + if (' . ((int)$javascript_is_function_select) . ') { + ' . $javascript_name_function_select . '(agent_name); + } + + //Function to call after the select + if (' . ((int)!empty($javascript_function_action_after_select_js_call)) . ') { + ' . $javascript_function_action_after_select_js_call . ' + } + + //Set icon + $("#' . $input_id . '") + .css("background", + "url(\"' . $icon_image . '\") right center no-repeat"); + + return; + } + }); + } + '; + if (isset($parameters['javascript_on_blur'])) { + $javascript_on_blur = $parameters['javascript_on_blur']; + } + //------------------------------------------------------------------ $html = ''; - $attrs = array('style' => 'background: url(' . $icon_image . ') no-repeat right;'); + $attrs = array( + 'style' => + 'background: url(' . $icon_image . ') no-repeat right;', + 'onblur' => $javascript_on_blur_function_name . '()'); $html = html_print_input_text_extended($input_name, $value, $input_id, $helptip_text, $size, $maxlength, $disabled, '', $attrs, true); @@ -2784,6 +2879,8 @@ function ui_print_agent_autocomplete_input($parameters) { $html .= $javascript_code_function_select; } + $html .= $javascript_on_blur; + if ($javascript_document_ready) { $html .= '$(document).ready (function () { set_functions_change_autocomplete_' . $input_name . '();