fix 1.2.4
This commit is contained in:
@@ -8,6 +8,8 @@ use App\Models\Gruppo;
|
||||
use App\Models\Individuo;
|
||||
use App\Models\Diocesi;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Pagination\LengthAwarePaginator;
|
||||
use Illuminate\Pagination\Paginator;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
class GruppoController extends Controller
|
||||
@@ -17,6 +19,7 @@ class GruppoController extends Controller
|
||||
$this->authorizeRead('gruppi');
|
||||
|
||||
$viewMode = request('view', 'table');
|
||||
$perPage = in_array((int) request('perPage'), [10, 20, 25, 50, 100]) ? (int) request('perPage') : 20;
|
||||
$user = auth()->user();
|
||||
|
||||
$vista = \App\Models\VistaReport::where('user_id', $user->id)
|
||||
@@ -48,7 +51,16 @@ class GruppoController extends Controller
|
||||
});
|
||||
|
||||
if ($viewMode === 'table') {
|
||||
$gruppi = $this->sortGruppiHierarchically($allGruppi);
|
||||
$sorted = $this->sortGruppiHierarchically($allGruppi);
|
||||
$page = Paginator::resolveCurrentPage();
|
||||
$gruppi = new LengthAwarePaginator(
|
||||
$sorted->forPage($page, $perPage)->values(),
|
||||
$sorted->count(),
|
||||
$perPage,
|
||||
$page,
|
||||
['path' => Paginator::resolveCurrentPath()]
|
||||
);
|
||||
$gruppi->appends(request()->except('page'));
|
||||
} else {
|
||||
$gruppi = $allGruppi;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user