Merge branch 'akaunting:master' into master

This commit is contained in:
Burak Civan
2021-06-23 13:32:15 +03:00
committed by GitHub
19 changed files with 23 additions and 23 deletions

View File

@@ -42,7 +42,7 @@ class Permission extends LaratrustPermission
$request = request();
$search = $request->get('search');
$limit = $request->get('limit', setting('default.list_limit', '25'));
$limit = (int) $request->get('limit', setting('default.list_limit', '25'));
return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
}

View File

@@ -35,7 +35,7 @@ class Role extends LaratrustRole
$request = request();
$search = $request->get('search');
$limit = $request->get('limit', setting('default.list_limit', '25'));
$limit = (int) $request->get('limit', setting('default.list_limit', '25'));
return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
}

View File

@@ -176,7 +176,7 @@ class User extends Authenticatable implements HasLocalePreference
$request = request();
$search = $request->get('search');
$limit = $request->get('limit', setting('default.list_limit', '25'));
$limit = (int) $request->get('limit', setting('default.list_limit', '25'));
return $query->usingSearchString($search)->sortable($sort)->paginate($limit);
}

View File

@@ -342,7 +342,7 @@ class Company extends Eloquent implements Ownable
return $query->get();
}
$limit = $request->get('limit', setting('default.list_limit', '25'));
$limit = (int) $request->get('limit', setting('default.list_limit', '25'));
return $query->paginate($limit);
}