mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-30 09:15:15 +02:00
Merge branch 'ent-1841-filtro-por-so-en-politicas-cepsa' into 'develop'
SO filter on policy See merge request artica/pandorafms!5331
This commit is contained in:
commit
05687a9ef2
@ -92,6 +92,7 @@ if (is_ajax() === true) {
|
|||||||
if ($get_group_agents === true) {
|
if ($get_group_agents === true) {
|
||||||
ob_clean();
|
ob_clean();
|
||||||
$id_group = (int) get_parameter('id_group');
|
$id_group = (int) get_parameter('id_group');
|
||||||
|
$id_os = (int) get_parameter('id_os', 0);
|
||||||
$disabled = (int) get_parameter('disabled', 0);
|
$disabled = (int) get_parameter('disabled', 0);
|
||||||
$search = (string) get_parameter('search', '');
|
$search = (string) get_parameter('search', '');
|
||||||
$recursion = (int) get_parameter('recursion', 0);
|
$recursion = (int) get_parameter('recursion', 0);
|
||||||
@ -151,6 +152,10 @@ if (is_ajax() === true) {
|
|||||||
$filter['status'] = $status_agents;
|
$filter['status'] = $status_agents;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($id_os !== 0) {
|
||||||
|
$filter['id_os'] = $id_os;
|
||||||
|
}
|
||||||
|
|
||||||
$_sql_post = ' 1=1 ';
|
$_sql_post = ' 1=1 ';
|
||||||
if ($show_void_agents == 0) {
|
if ($show_void_agents == 0) {
|
||||||
$_sql_post .= ' AND id_agente IN (SELECT a.id_agente FROM tagente a, tagente_modulo b WHERE a.id_agente=b.id_agente AND b.delete_pending=0) AND \'1\'';
|
$_sql_post .= ' AND id_agente IN (SELECT a.id_agente FROM tagente a, tagente_modulo b WHERE a.id_agente=b.id_agente AND b.delete_pending=0) AND \'1\'';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user