Merge branch 'ent-7689-busqueda-de-usuarios-con-paginacion' into 'develop'

fixed error with pagination user filter

See merge request artica/pandorafms!4209
This commit is contained in:
Daniel Rodriguez 2021-08-23 10:48:46 +00:00
commit 76ead757b0

View File

@ -129,7 +129,7 @@ switch ($sortField) {
break; break;
default: default:
// Not possible. // Nothing to do.
break; break;
} }
break; break;
@ -153,7 +153,7 @@ switch ($sortField) {
break; break;
default: default:
// Not possible. // Nothing to do.
break; break;
} }
break; break;
@ -177,7 +177,7 @@ switch ($sortField) {
break; break;
default: default:
// Not possible. // Nothing to do.
break; break;
} }
break; break;
@ -585,11 +585,11 @@ foreach ($info as $user_id => $user_info) {
$cont++; $cont++;
// Manual pagination due the complicated process of the ACL data. // Manual pagination due the complicated process of the ACL data.
if ($cont <= $offset) { if ($cont <= $offset && $search !== true) {
continue; continue;
} }
if ($cont > ($limit + $offset)) { if ($cont > ($limit + $offset) && $search !== true) {
break; break;
} }
@ -820,6 +820,9 @@ foreach ($info as $user_id => $user_info) {
$data[6] .= ''; $data[6] .= '';
// Delete button not in this mode. // Delete button not in this mode.
} }
} else {
$data[6] .= '';
// Delete button not in this mode.
} }
} }