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

2011-07-15 Sergio Martin <sergio.martin@artica.es> 

* include/javascript/pandora.js
	operation/agentes/ver_agente.php: Add hack to send to the ajax
	a custom condition of modules in the agent_changed_by_multiple_agents



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4577 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-07-15 12:45:23 +00:00
parent 0d5ce31cc7
commit c5d23bc9f4
3 changed files with 19 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 @@
2011-07-15 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora.js
operation/agentes/ver_agente.php: Add hack to send to the ajax
a custom condition of modules in the agent_changed_by_multiple_agents
2011-07-15 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_gis.php: Changed name of function safe_input to

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

@ -132,6 +132,14 @@ function isEmptyObject(obj) {
* @param selected Which module(s) have to be selected
*/
function agent_changed_by_multiple_agents (event, id_agent, selected) {
// Hack to add custom condition
if($("#hidden-custom_condition").val() != undefined) {
custom_condition = $("#hidden-custom_condition").val();
}
else {
custom_condition = '';
}
var idAgents = Array();
jQuery.each ($("#id_agents option:selected"), function (i, val) {
@ -155,7 +163,8 @@ function agent_changed_by_multiple_agents (event, id_agent, selected) {
{"page": "operation/agentes/ver_agente",
"get_agent_modules_json_for_multiple_agents": 1,
"id_agent[]": idAgents,
"all": find_modules
"all": find_modules,
"custom_condition": custom_condition
},
function (data) {
$('#module').empty ();

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

@ -133,6 +133,7 @@ if (is_ajax ()) {
if ($get_agent_modules_json_for_multiple_agents) {
$idAgents = get_parameter('id_agent');
$custom_condition = get_parameter('custom_condition', '');
$all = (string)get_parameter('all', 'all');
switch ($all) {
default:
@ -191,7 +192,8 @@ if (is_ajax ()) {
$nameModules = db_get_all_rows_sql('SELECT DISTINCT(nombre)
FROM tagente_modulo t1
WHERE ' . $enabled . '
WHERE ' . $enabled .
io_safe_output($custom_condition) . '
AND delete_pending = 0
AND id_agente IN (' . implode(',', $idAgents) . ') AND (
SELECT count(nombre)