Skip to content

A free open source IT asset/license management system

Use paginateCollectionOrAll() for longer selectlists

snipea0bcd35041b7
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index f34362bee7..501a9b8b71 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -126,6 +126,50 @@ class Helper
);
}
+ /**
+ * Return every item on a single page when the API call passes
+ * `?all=true` on the request. Used by the checkbox-multiselect
+ * "Select all" button so it can pull the full filtered result set
+ * in one call instead of walking paginated pages.
+ *
+ * Caps the response at $cap items as a guardrail against runaway
+ * reads. The explicit $cap argument lets a controller pin a lower
+ * ceiling it knows is appropriate for its shape. Omitted, the
+ * default is `config('app.max_unpaginated_records')` (operator
+ * knob via MAX_UNPAGINATED, same lever the Groups bulk-user
+ * picker respects).
+ *
+ * A client-provided `?cap=` on the request is honored only as a
+ * CEILING SUGGESTION: it can lower the effective cap but never
+ * raise it. A malicious `?cap=99999999` is silently limited to
+ * the server-side value above. This is what lets per-widget
+ * data-max-select-all attributes work without opening a runaway
+ * surface.
+ *
+ * Falls through to paginateCollection() for everything else so
+ * existing callers keep working.
+ */
+ public static function paginateCollectionOrAll(Collection $items, ?int $cap = null): LengthAwarePaginator
+ {
+ if (!request()->boolean('all')) {
+ return self::paginateCollection($items);
+ }
+
+ $cap ??= (int) config('app.max_unpaginated_records', 5000);
+ $clientCap = (int) request()->integer('cap', PHP_INT_MAX);
+ if ($clientCap > 0) {
+ $cap = min($cap, $clientCap);
+ }
+ $capped = $items->take($cap)->values();
+
+ return new LengthAwarePaginator(
+ $capped,
+ $capped->count(),
+ max($capped->count(), 1),
+ 1,
+ );
+ }
+
public static function parseEscapedMarkedownInline($str = null)
{
$Parsedown = new \Parsedown;
@@ -824,7 +868,8 @@ class Helper
$deprecations = [
'ms_teams_deprecated' => [
'check' => ! Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows') && (Setting::getSettings()->webhook_selected === 'microsoft'),
- 'message' => 'The Microsoft Teams webhook URL being used will be deprecated Dec 31st, 2025. <a class="btn btn-primary" href="' . route('settings.integrations.index') . '">Change webhook endpoint</a>'],
+ 'message' => 'The Microsoft Teams webhook URL being used will be deprecated Dec 31st, 2025. <a class="btn btn-primary" href="' . route('settings.integrations.index') . '">Change webhook endpoint</a>',
+ ],
];
// if item of concern is being used and its being used with the deprecated values return the notification array.
diff --git a/app/Http/Controllers/Api/CompaniesController.php b/app/Http/Controllers/Api/CompaniesController.php
index a2f7c0dc64..3ea48f3efe 100644
--- a/app/Http/Controllers/Api/CompaniesController.php
+++ b/app/Http/Controllers/Api/CompaniesController.php
@@ -321,6 +321,6 @@ class CompaniesController extends Controller
$sorted = new Collection(Company::indenter($companies_by_parent));
}
- return (new SelectlistTransformer)->transformSelectlist(Helper::paginateCollection($sorted));
+ return (new SelectlistTransformer)->transformSelectlist(Helper::paginateCollectionOrAll($sorted));
}
}
diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php
index ac83d871cb..4b72d7db78 100644
--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -7,6 +7,7 @@ use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\FilterRequest;
use App\Http\Transformers\GroupsTransformer;
+use App\Http\Transformers\SelectlistTransformer;
use App\Models\Group;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -169,4 +170,19 @@ class GroupsController extends Controller
return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/groups/message.delete.success')));
}
+
+ public function selectlist(Request $request): array
+ {
+ $this->authorize('superadmin');
+
+ $groups = Group::select(['id', 'name']);
+
+ if ($request->filled('search')) {
+ $groups->where('name', 'LIKE', '%' . $request->input('search') . '%');
+ }
+
+ $sorted = $groups->orderBy('name', 'asc')->get();
+
+ return (new SelectlistTransformer)->transformSelectlist(Helper::paginateCollectionOrAll($sorted));
+ }
}
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index c71de6f583..d9da5e1b2c 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -444,7 +444,20 @@ class UsersController extends Controller
}
$users = $users->orderBy('display_name', 'asc')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc');
- $users = $users->paginate(50);
+
+ // ?all=1 opts into the single-page response the checkbox-list /
+ // checkbox-multiselect pickers use for Select All. Capped by
+ // config('app.max_unpaginated_records'), bounded further by any
+ // ?cap=N the client sends (never higher than the config value).
+ if (request()->boolean('all')) {
+ $serverCap = (int) config('app.max_unpaginated_records', 5000);
+ $clientCap = (int) request()->integer('cap', PHP_INT_MAX);
+ $cap = $clientCap > 0 ? min($serverCap, $clientCap) : $serverCap;
+ $perPage = max($cap, 1);
+ $users = $users->paginate($perPage);
+ } else {
+ $users = $users->paginate(50);
+ }
foreach ($users as $user) {
$name_str = $user->display_name;
diff --git a/app/Http/Controllers/GroupsController.php b/app/Http/Controllers/GroupsController.php
index 8a6006b8e6..ec5a64fa84 100755
--- a/app/Http/Controllers/GroupsController.php
+++ b/app/Http/Controllers/GroupsController.php
@@ -5,7 +5,6 @@ namespace App\Http\Controllers;
use App\Actions\Permissions\NormalizePermissionsPayloadAction;
use App\Helpers\Helper;
use App\Models\Group;
-use App\Models\User;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
@@ -47,24 +46,10 @@ class GroupsController extends Controller
$permissions = config('permissions');
$groupPermissions = Helper::selectedPermissionsArray($permissions, $permissions);
$selectedPermissions = $request->old('permissions', $groupPermissions);
- $users_query = User::query()
- ->select(['users.id', 'users.first_name', 'users.last_name', 'users.username'])
- ->where('show_in_list', 1)
- ->whereNull('deleted_at');
- $users_count = $users_query->count();
-
- $users = collect();
- if ($users_count <= config('app.max_unpaginated_records')) {
- $users = $users_query->orderBy('first_name', 'asc')->orderBy('last_name', 'asc')->get();
- }
-
- // Show the page
return view('groups/edit', compact('permissions', 'selectedPermissions', 'groupPermissions'))
->with('group', $group)
- ->with('associated_users', collect())
- ->with('unselected_users', $users)
- ->with('all_users_count', $users_count);
+ ->with('associated_user_ids', []);
}
/**
@@ -124,32 +109,12 @@ class GroupsController extends Controller
$selected_array = Helper::selectedPermissionsArray($permissions, $groupPermissions);
- $users_query = User::query()
- ->select(['users.id', 'users.first_name', 'users.last_name', 'users.username'])
- ->where('show_in_list', 1)
- ->whereNull('deleted_at');
-
- $users_count = $users_query->count();
-
- $associated_users = collect();
- $unselected_users = collect();
-
- if ($users_count <= config('app.max_unpaginated_records')) {
- $associated_users = $group->users()->where('show_in_list', 1)->orderBy('first_name', 'asc')->orderBy('last_name', 'asc')->get();
- // Get the unselected users
- $unselected_users = User::query()
- ->select(['users.id', 'users.first_name', 'users.last_name', 'users.username'])
- ->where('show_in_list', 1)
- ->whereNotIn('id', $associated_users->pluck('id')->toArray())
- ->orderBy('first_name', 'asc')
- ->orderBy('last_name', 'asc')
- ->get();
- }
+ // Only the ids are needed. The checkbox-list component seeds its
+ // hidden CSV from this and loads the row text/image from the
+ // selectlist endpoint as the user scrolls.
+ $associated_user_ids = $group->users()->where('show_in_list', 1)->pluck('users.id')->all();
- return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions'))
- ->with('associated_users', $associated_users)
- ->with('unselected_users', $unselected_users)
- ->with('all_users_count', $users_count);
+ return view('groups.edit', compact('group', 'permissions', 'selected_array', 'groupPermissions', 'associated_user_ids'));
}
/**
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 4ffb7b2740..5fd9f37817 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -178,7 +178,7 @@ class UsersController extends Controller
}
if (auth()->user()->isSuperUser() && auth()->user()->can('editableOnDemo')) {
- $user->syncGroupsWithLogging((array) $request->input('groups'));
+ $user->syncGroupsWithLogging(self::normalizeGroupsInput($request->input('groups')));
}
return Helper::getRedirectOption($request, $user->id, 'Users')
@@ -200,6 +200,33 @@ class UsersController extends Controller
return $output;
}
+ /**
+ * Normalize the groups form input to an int array of group ids.
+ * The legacy user form posted groups[] as separate inputs (one per
+ * selected group). The scrolling checkbox-list on the new form
+ * posts a single hidden CSV, matching the groups-edit pattern.
+ * Accept both shapes so other callers (API, cloning, legacy
+ * clients) keep working.
+ */
+ private static function normalizeGroupsInput(mixed $input): array
+ {
+ if (is_array($input)) {
+ return array_values(array_filter(
+ array_map('intval', $input),
+ fn (int $id) => $id > 0,
+ ));
+ }
+
+ if (is_string($input) && $input !== '') {
+ return array_values(array_filter(
+ array_map('intval', explode(',', $input)),
+ fn (int $id) => $id > 0,
+ ));
+ }
+
+ return [];
+ }
+
/**
* Returns a view that displays the edit user form
*
@@ -354,7 +381,7 @@ class UsersController extends Controller
if (auth()->user()->isSuperUser()
&& auth()->user()->can('canEditAuthFields', $user)
&& auth()->user()->can('editableOnDemo')) {
- $user->syncGroupsWithLogging((array) $request->input('groups'));
+ $user->syncGroupsWithLogging(self::normalizeGroupsInput($request->input('groups')));
}
// Redirect to the user page
diff --git a/config/app.php b/config/app.php
index cf6a6a914e..ecb6e1be1d 100755
--- a/config/app.php
+++ b/config/app.php
@@ -613,7 +613,7 @@ return [
| viewed without pagination. This is to prevent server timeouts.
*/
- 'max_unpaginated_records' => env('MAX_UNPAGINATED', '5000'),
+ 'max_unpaginated_records' => env('MAX_UNPAGINATED', '10000'),
/*
|--------------------------------------------------------------------------