Merge pull request #44 from martijnr17/patch-1

jeremykenedy · web-flow · commit 362fd177b479 · 2020-04-25T23:56:45.000-07:00
Update UsersManagementController.php
diff --git a/src/App/Http/Controllers/UsersManagementController.php b/src/App/Http/Controllers/UsersManagementController.php
@@ -156,13 +156,13 @@ public function edit($id)
     {
         $user = config('laravelusers.defaultUserModel')::findOrFail($id);
         $roles = [];
-        $currentRole = '';
+        $currentRole = [];
 
         if ($this->_rolesEnabled) {
             $roles = config('laravelusers.roleModel')::all();
 
             foreach ($user->roles as $user_role) {
-                $currentRole = $user_role;
+                $currentRole[] = $user_role->id;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -156,13 +156,13 @@ public function edit($id)`
`156`	`156`	`{`
`157`	`157`	`$user = config('laravelusers.defaultUserModel')::findOrFail($id);`
`158`	`158`	`$roles = [];`
`159`		`- $currentRole = '';`
	`159`	`+ $currentRole = [];`
`160`	`160`
`161`	`161`	`if ($this->_rolesEnabled) {`
`162`	`162`	`$roles = config('laravelusers.roleModel')::all();`
`163`	`163`
`164`	`164`	`foreach ($user->roles as $user_role) {`
`165`		`- $currentRole = $user_role;`
	`165`	`+ $currentRole[] = $user_role->id;`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`