Commit 65987dc1 authored by Viral Solani's avatar Viral Solani

Merge branch 'user-module' of https://github.com/viralsolani/laravel-adminpanel into user-module

parents b586a45d 37cb8176
...@@ -337,5 +337,4 @@ trait UserAccess ...@@ -337,5 +337,4 @@ trait UserAccess
$this->permissions()->detach($permission); $this->permissions()->detach($permission);
} }
} }
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment