tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 17:25:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1676-Tags-y-vista-de-alertas-2' into 'develop'

Browse Source 
Show all alerts when select all tags filter - #1676

See merge request artica/pandorafms!1271
This commit is contained in:
vgilc 2018-02-05 15:57:40 +01:00
commit 48b6dc56fd
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/include/functions_alerts.php
View File

@ -1747,10 +1747,21 @@ function get_group_alerts($id_group, $filter = '', $options = false,
break; break;
} }
//WHEN SELECT ALL TAGS TO FILTER ALERTS
$modules_tags = count(db_process_sql('select * from ttag'));
$modules_user_tags = count(explode(",", $tag));
if($modules_tags != $modules_user_tags){
if ($tag) { if ($tag) {
$filter .= ' AND (id_agent_module IN (SELECT id_agente_modulo FROM ttag_module WHERE id_tag IN ('.$tag.')))'; $filter .= ' AND (id_agent_module IN (SELECT id_agente_modulo FROM ttag_module WHERE id_tag IN ('.$tag.')))';
} }
}
//WHEN SELECT ALL TAGS TO FILTER ALERTS
if($action_filter){ if($action_filter){
$filter .= ' AND (talert_template_modules.id IN (SELECT id_alert_template_module FROM talert_template_module_actions where id_alert_action = '.$action_filter.'))'; $filter .= ' AND (talert_template_modules.id IN (SELECT id_alert_template_module FROM talert_template_module_actions where id_alert_action = '.$action_filter.'))';
} }