Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laravel-adminpanel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
laravel-adminpanel
Commits
95c68d8c
Commit
95c68d8c
authored
Jul 04, 2018
by
Viral Solani
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://github.com/viralsolani/laravel-adminpanel
into develop
parents
252943e0
5d23ad54
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
PermissionController.php
app/Http/Controllers/Api/V1/PermissionController.php
+4
-4
RolesController.php
app/Http/Controllers/Api/V1/RolesController.php
+4
-4
UsersController.php
app/Http/Controllers/Api/V1/UsersController.php
+4
-4
No files found.
app/Http/Controllers/Api/V1/PermissionController.php
View file @
95c68d8c
...
...
@@ -31,12 +31,12 @@ class PermissionController extends APIController
*/
public
function
index
(
Request
$request
)
{
$limit
=
$request
->
get
(
'paginate'
)
?
$request
->
get
(
'paginate'
)
:
25
;
$orderBy
=
$request
->
get
(
'orderBy'
)
?
$request
->
get
(
'orderBy'
)
:
'ASC'
;
$sortBy
=
$request
->
get
(
'sortBy'
)
?
$request
->
get
(
'sortBy'
)
:
'created_at'
;
$limit
=
$request
->
get
(
'paginate'
)
?
$request
->
get
(
'paginate'
)
:
25
;
$orderBy
=
$request
->
get
(
'orderBy'
)
?
$request
->
get
(
'orderBy'
)
:
'ASC'
;
$sortBy
=
$request
->
get
(
'sortBy'
)
?
$request
->
get
(
'sortBy'
)
:
'created_at'
;
return
PermissionResource
::
collection
(
$this
->
repository
->
getForDataTable
()
->
orderBy
(
$sortBy
,
$orderBy
)
->
paginate
(
$limit
)
$this
->
repository
->
getForDataTable
()
->
orderBy
(
$sortBy
,
$orderBy
)
->
paginate
(
$limit
)
);
}
...
...
app/Http/Controllers/Api/V1/RolesController.php
View file @
95c68d8c
...
...
@@ -31,12 +31,12 @@ class RolesController extends APIController
*/
public
function
index
(
Request
$request
)
{
$limit
=
$request
->
get
(
'paginate'
)
?
$request
->
get
(
'paginate'
)
:
25
;
$orderBy
=
$request
->
get
(
'orderBy'
)
?
$request
->
get
(
'orderBy'
)
:
'ASC'
;
$sortBy
=
$request
->
get
(
'sortBy'
)
?
$request
->
get
(
'sortBy'
)
:
'created_at'
;
$limit
=
$request
->
get
(
'paginate'
)
?
$request
->
get
(
'paginate'
)
:
25
;
$orderBy
=
$request
->
get
(
'orderBy'
)
?
$request
->
get
(
'orderBy'
)
:
'ASC'
;
$sortBy
=
$request
->
get
(
'sortBy'
)
?
$request
->
get
(
'sortBy'
)
:
'created_at'
;
return
RoleResource
::
collection
(
$this
->
repository
->
getForDataTable
()
->
orderBy
(
$sortBy
,
$orderBy
)
->
paginate
(
$limit
)
$this
->
repository
->
getForDataTable
()
->
orderBy
(
$sortBy
,
$orderBy
)
->
paginate
(
$limit
)
);
}
...
...
app/Http/Controllers/Api/V1/UsersController.php
View file @
95c68d8c
...
...
@@ -31,12 +31,12 @@ class UsersController extends APIController
*/
public
function
index
(
Request
$request
)
{
$limit
=
$request
->
get
(
'paginate'
)
?
$request
->
get
(
'paginate'
)
:
25
;
$orderBy
=
$request
->
get
(
'orderBy'
)
?
$request
->
get
(
'orderBy'
)
:
'ASC'
;
$sortBy
=
$request
->
get
(
'sortBy'
)
?
$request
->
get
(
'sortBy'
)
:
'created_at'
;
$limit
=
$request
->
get
(
'paginate'
)
?
$request
->
get
(
'paginate'
)
:
25
;
$orderBy
=
$request
->
get
(
'orderBy'
)
?
$request
->
get
(
'orderBy'
)
:
'ASC'
;
$sortBy
=
$request
->
get
(
'sortBy'
)
?
$request
->
get
(
'sortBy'
)
:
'created_at'
;
return
UserResource
::
collection
(
$this
->
repository
->
getForDataTable
(
1
,
false
)
->
orderBy
(
$sortBy
,
$orderBy
)
->
paginate
(
$limit
)
$this
->
repository
->
getForDataTable
(
1
,
false
)
->
orderBy
(
$sortBy
,
$orderBy
)
->
paginate
(
$limit
)
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment