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

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

* include/javascript/pandora.js
	 include/ajax/agent.php: Fixed autocomplete agent functionality when
	 metaconsole is activated.
	 
	 Fixes: #3514539



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5915 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-04-09 14:09:13 +00:00
parent 399ac5ca98
commit a93d5c5bdf
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2012-04-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/javascript/pandora.js
include/ajax/agent.php: Fixed autocomplete agent functionality when
metaconsole is activated.
Fixes: #3514539
2012-04-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2012-04-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/menu.php: Fixed first entry in godmode menu. * godmode/menu.php: Fixed first entry in godmode menu.

2
pandora_console/include/ajax/agent.php
View File

@ -187,7 +187,7 @@ if ($search_agents_2 && ($config['metaconsole'] == 0)) {
return; return;
} }
elseif ($search_agents && ($config['metaconsole'] == 1)) { elseif ($search_agents_2 && ($config['metaconsole'] == 1)) {
$servers = db_get_all_rows_sql ("SELECT * FROM tmetaconsole_setup"); $servers = db_get_all_rows_sql ("SELECT * FROM tmetaconsole_setup");
if (!isset($servers)) { if (!isset($servers)) {
return; return;

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

@ -457,6 +457,11 @@ function agent_module_autocomplete (id_agent_name, id_agent_id, id_agent_module_
var agent_name = ui.item.name; var agent_name = ui.item.name;
var agent_id = ui.item.id; var agent_id = ui.item.id;
var server_name = ui.item.ip; var server_name = ui.item.ip;
if (agent_name.indexOf("(") != -1){
var server_name_temp = agent_name.split('(');
server_name_temp1 = server_name_temp[1].split(')');
server_name = server_name_temp1[0];
}
//Put the name //Put the name
$(this).val(agent_name); $(this).val(agent_name);