lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #12683 from snipe/fixes/additional_sort

Browse source 
Fixes/additional sort
This commit is contained in:
snipe 2023-03-16 16:08:51 -07:00 • committed by GitHub
commit d6434fa55a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/Api/UsersController.php
View file

@ -192,7 +192,6 @@ class UsersController extends Controller
} }
$order = $request->input('order') === 'asc' ? 'asc' : 'desc'; $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
$offset = (($users) && (request('offset') > $users->count())) ? 0 : request('offset', 0);
// Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
// case we override with the actual count, so we should return 0 items. // case we override with the actual count, so we should return 0 items.
@ -218,6 +217,14 @@ class UsersController extends Controller
case 'company': case 'company':
$users = $users->OrderCompany($order); $users = $users->OrderCompany($order);
break; break;
case 'first_name':
$users->orderBy('first_name', $order);
$users->orderBy('last_name', $order);
break;
case 'last_name':
$users->orderBy('last_name', $order);
$users->orderBy('first_name', $order);
break;
default: default:
$allowed_columns = $allowed_columns =
[ [