mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-24 22:35:58 +02:00
Merge branch 'ent-13288-mapas-de-red-vacios-cargan-todos-los-agentes-en-funcion-al-grupo' into 'develop'
Ent 13288 mapas de red vacios cargan todos los agentes en funcion al grupo See merge request artica/pandorafms!7265
This commit is contained in:
commit
81fd935f91
@ -1026,11 +1026,18 @@ if (is_ajax() === true) {
|
||||
return;
|
||||
}
|
||||
|
||||
$data = networkmap_refresh_holding_area($networkmap_id, $x, $y);
|
||||
$filter = db_get_value('filter', 'tmap', 'id', $networkmap_id);
|
||||
$filter = json_decode($filter, true);
|
||||
|
||||
if (!empty($data)) {
|
||||
$return['correct'] = true;
|
||||
$return['holding_area'] = $data;
|
||||
if (isset($filter['empty_map']) === false
|
||||
|| (isset($filter['empty_map']) === true && $filter['empty_map'] !== 1)
|
||||
) {
|
||||
$data = networkmap_refresh_holding_area($networkmap_id, $x, $y);
|
||||
|
||||
if (!empty($data)) {
|
||||
$return['correct'] = true;
|
||||
$return['holding_area'] = $data;
|
||||
}
|
||||
}
|
||||
|
||||
ob_end_clean();
|
||||
|
Loading…
x
Reference in New Issue
Block a user