Skip to content

Commit 95c68d8

Browse files
committed
Merge branch 'develop' of https://github.com/viralsolani/laravel-adminpanel into develop
2 parents 252943e + 5d23ad5 commit 95c68d8

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

app/Http/Controllers/Api/V1/PermissionController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public function __construct(PermissionRepository $repository)
3131
*/
3232
public function index(Request $request)
3333
{
34-
$limit = $request->get('paginate') ? $request->get('paginate') : 25;
35-
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
36-
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
34+
$limit = $request->get('paginate') ? $request->get('paginate') : 25;
35+
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
36+
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
3737

3838
return PermissionResource::collection(
39-
$this->repository->getForDataTable()->orderBy($sortBy,$orderBy)->paginate($limit)
39+
$this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
4040
);
4141
}
4242

app/Http/Controllers/Api/V1/RolesController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public function __construct(RoleRepository $repository)
3131
*/
3232
public function index(Request $request)
3333
{
34-
$limit = $request->get('paginate') ? $request->get('paginate') : 25;
35-
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
36-
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
34+
$limit = $request->get('paginate') ? $request->get('paginate') : 25;
35+
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
36+
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
3737

3838
return RoleResource::collection(
39-
$this->repository->getForDataTable()->orderBy($sortBy,$orderBy)->paginate($limit)
39+
$this->repository->getForDataTable()->orderBy($sortBy, $orderBy)->paginate($limit)
4040
);
4141
}
4242

app/Http/Controllers/Api/V1/UsersController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public function __construct(UserRepository $repository)
3131
*/
3232
public function index(Request $request)
3333
{
34-
$limit = $request->get('paginate') ? $request->get('paginate') : 25;
35-
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
36-
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
34+
$limit = $request->get('paginate') ? $request->get('paginate') : 25;
35+
$orderBy = $request->get('orderBy') ? $request->get('orderBy') : 'ASC';
36+
$sortBy = $request->get('sortBy') ? $request->get('sortBy') : 'created_at';
3737

3838
return UserResource::collection(
39-
$this->repository->getForDataTable(1, false)->orderBy($sortBy,$orderBy)->paginate($limit)
39+
$this->repository->getForDataTable(1, false)->orderBy($sortBy, $orderBy)->paginate($limit)
4040
);
4141
}
4242

0 commit comments

Comments
 (0)