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

2012-07-27 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_groups.php:Removed trace.
	
    * include/javascript/pandora.js: Added modification to ajax call
	  when it's called form metaconsole.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6824 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-07-27 10:09:04 +00:00
parent 785390bd54
commit e35c763b07
3 changed files with 17 additions and 4 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-07-27 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_groups.php:Removed trace.
* include/javascript/pandora.js: Added modification to ajax call
when it's called form metaconsole.
2012-07-27 Miguel de Dios <miguel.dedios@artica.es>
* godmode/gis_maps/index.php, godmode/groups/group_list.php,

2
pandora_console/include/functions_groups.php
View File

@ -1273,7 +1273,7 @@ function groups_total_agents ($group_array, $disabled = false) {
if (!$disabled)
$sql .= " AND disabled = 0";
html_debug_print($sql, "/tmp/pp");
return db_get_sql ($sql);
}

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

@ -563,12 +563,18 @@ function agent_module_autocomplete (id_agent_name, id_agent_id, id_agent_module_
* @param id_agent_name id of the agent name box
* @param id_server_name id of the hidden field to store the server but if you put false don't save.
* @param id_agent_id id of the hidden field to store the agent id
* @param metaconsole_exec If defined then path of ajax.php call will be modified
*/
function agent_autocomplete (id_agent_name, id_server_name, id_agent_id ) {
function agent_autocomplete (id_agent_name, id_server_name, id_agent_id, metaconsole_exec ) {
//Check exist the field with id in the var id_agent_name.
if ($(id_agent_name).length == 0)
return;
// Correction over ajax call for metaconsole
ajax_path = '';
if (metaconsole_exec != undefined)
ajax_path = '../../';
$(id_agent_name).autocomplete({
minLength: 2,
source: function( request, response ) {
@ -582,7 +588,7 @@ function agent_autocomplete (id_agent_name, id_server_name, id_agent_id ) {
data: data_params,
async: false,
type: 'POST',
url: action="ajax.php",
url: action= ajax_path + "ajax.php",
timeout: 10000,
dataType: 'json',
success: function (data) {