shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2841 from EnesSacid-Buker/master

Browse Source 
Collect function in models
This commit is contained in:
Cüneyt Şentürk 2022-12-20 17:02:22 +03:00 committed by GitHub
commit 5361201425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Abstracts/Model.php
View File

@ -102,12 +102,22 @@ abstract class Model extends Eloquent implements Ownable
{
$request = request();
/**
* Modules that use the sort parameter in CRUD operations cause an error,
* so this sort parameter set back to old value after the query is executed.
*
* for Custom Fields module
*/
$request_sort = $request->get('sort');
$query->usingSearchString()->sortable($sort);
if ($request->expectsJson() && $request->isNotApi()) {
return $query->get();
}
$request->merge(['sort' => $request_sort]);
$request->offsetUnset('direction');
$limit = (int) $request->get('limit', setting('default.list_limit', '25'));
return $query->paginate($limit);

16
app/Models/Auth/User.php
View File

@ -190,11 +190,23 @@ class User extends Authenticatable implements HasLocalePreference
public function scopeCollect($query, $sort = 'name')
{
$request = request();
$search = $request->get('search');
/**
* Modules that use the sort parameter in CRUD operations cause an error,
* so this sort parameter set back to old value after the query is executed.
*
* for Custom Fields module
*/
$request_sort = $request->get('sort');
$query->usingSearchString($search)->sortable($sort);
$request->merge(['sort' => $request_sort]);
$request->offsetUnset('direction');
$limit = (int) $request->get('limit', setting('default.list_limit', '25'));
return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
return $query->paginate($limit);
}
/**