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
37cb8176
Unverified
Commit
37cb8176
authored
Nov 26, 2017
by
Viral Solani
Committed by
GitHub
Nov 26, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #42 from viralsolani/analysis-8Q4Bgm
Apply fixes from StyleCI
parents
71e026d7
5d8bd22a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
UserAccess.php
app/Models/Access/User/Traits/UserAccess.php
+0
-1
UserRepository.php
app/Repositories/Backend/Access/User/UserRepository.php
+3
-3
No files found.
app/Models/Access/User/Traits/UserAccess.php
View file @
37cb8176
...
@@ -337,5 +337,4 @@ trait UserAccess
...
@@ -337,5 +337,4 @@ trait UserAccess
$this
->
permissions
()
->
detach
(
$permission
);
$this
->
permissions
()
->
detach
(
$permission
);
}
}
}
}
app/Repositories/Backend/Access/User/UserRepository.php
View file @
37cb8176
...
@@ -173,7 +173,6 @@ class UserRepository extends BaseRepository
...
@@ -173,7 +173,6 @@ class UserRepository extends BaseRepository
DB
::
transaction
(
function
()
use
(
$user
,
$data
,
$roles
,
$permissions
)
{
DB
::
transaction
(
function
()
use
(
$user
,
$data
,
$roles
,
$permissions
)
{
if
(
$user
->
update
(
$data
))
{
if
(
$user
->
update
(
$data
))
{
$user
->
status
=
isset
(
$data
[
'status'
])
?
1
:
0
;
$user
->
status
=
isset
(
$data
[
'status'
])
?
1
:
0
;
$user
->
confirmed
=
isset
(
$data
[
'confirmed'
])
?
1
:
0
;
$user
->
confirmed
=
isset
(
$data
[
'confirmed'
])
?
1
:
0
;
$user
->
save
();
$user
->
save
();
...
@@ -183,6 +182,7 @@ class UserRepository extends BaseRepository
...
@@ -183,6 +182,7 @@ class UserRepository extends BaseRepository
$this
->
flushPermissions
(
$permissions
,
$user
);
$this
->
flushPermissions
(
$permissions
,
$user
);
event
(
new
UserUpdated
(
$user
));
event
(
new
UserUpdated
(
$user
));
return
true
;
return
true
;
}
}
...
@@ -348,7 +348,7 @@ class UserRepository extends BaseRepository
...
@@ -348,7 +348,7 @@ class UserRepository extends BaseRepository
}
}
/**
/**
* Flush roles out, then add array of new ones
* Flush roles out, then add array of new ones
.
*
*
* @param $roles
* @param $roles
* @param $user
* @param $user
...
@@ -361,7 +361,7 @@ class UserRepository extends BaseRepository
...
@@ -361,7 +361,7 @@ class UserRepository extends BaseRepository
}
}
/**
/**
* Flush Permissions out, then add array of new ones
* Flush Permissions out, then add array of new ones
.
*
*
* @param $permissions
* @param $permissions
* @param $user
* @param $user
...
...
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