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

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

* include/javascript/pandora.js
	 operation/agentes/ver_agente.php: Fixed multiselect in wizards 
	 of Pandora Console.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7065 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-10-10 18:04:57 +00:00
parent f39fdfcff1
commit d6b43d845d
3 changed files with 18 additions and 2 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-10-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/javascript/pandora.js
operation/agentes/ver_agente.php: Fixed multiselect in wizards
of Pandora Console.
2012-10-10 Miguel de Dios <miguel.dedios@artica.es> 2012-10-10 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php: fixes and changes for the new * include/functions_networkmap.php: fixes and changes for the new

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

@ -164,6 +164,11 @@ function agent_changed_by_multiple_agents (event, id_agent, selected) {
selection_mode = 'common'; selection_mode = 'common';
} }
var serialized = $('#hidden-serialized').val();
if (serialized == undefined) {
serialized = '';
}
$('#module').attr ('disabled', 1); $('#module').attr ('disabled', 1);
$('#module').empty (); $('#module').empty ();
$('#module').append ($('<option></option>').html ("Loading...").attr ("value", 0)); $('#module').append ($('<option></option>').html ("Loading...").attr ("value", 0));
@ -181,7 +186,8 @@ function agent_changed_by_multiple_agents (event, id_agent, selected) {
"id_agent[]": idAgents, "id_agent[]": idAgents,
"all": find_modules, "all": find_modules,
"custom_condition": custom_condition, "custom_condition": custom_condition,
"selection_mode": selection_mode "selection_mode": selection_mode,
"serialized": serialized
}, },
function (data) { function (data) {
$('#module').empty (); $('#module').empty ();

6
pandora_console/operation/agentes/ver_agente.php
View File

@ -166,6 +166,7 @@ if (is_ajax ()) {
$idAgents = get_parameter('id_agent'); $idAgents = get_parameter('id_agent');
$custom_condition = get_parameter('custom_condition', ''); $custom_condition = get_parameter('custom_condition', '');
$selection_mode = get_parameter('selection_mode', 'common'); $selection_mode = get_parameter('selection_mode', 'common');
$serialized = get_parameter('serialized', '');
$all = (string)get_parameter('all', 'all'); $all = (string)get_parameter('all', 'all');
switch ($all) { switch ($all) {
@ -288,7 +289,10 @@ if (is_ajax ()) {
$result = array(); $result = array();
foreach($nameModules as $nameModule) { foreach($nameModules as $nameModule) {
$result[$nameModule['nombre'].'$*$'.implode('|', $idAgents)] = io_safe_output($nameModule['nombre']); if (empty($serialized))
$result[$nameModule['nombre']] = io_safe_output($nameModule['nombre']);
else
$result[$nameModule['nombre'].'$*$'.implode('|', $idAgents)] = io_safe_output($nameModule['nombre']);
} }
} }