Updated user editing for admins

P3D-Legacy · Jan 26, 2021 · e5a523d · e5a523d
1 parent def6b30
commit e5a523d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,14 @@
 
+<a name="0.2.2"></a>
+## [0.2.2](https://github.com/P3D-Legacy/skin.pokemon3d.net/compare/0.2.1...0.2.2)
+
+> 2021-01-26
+
+### Updated
+
+* Updated user editing for admins
+
+
 <a name="0.2.1"></a>
 ## [0.2.1](https://github.com/P3D-Legacy/skin.pokemon3d.net/compare/0.2.0...0.2.1)
 

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -60,9 +60,10 @@ public function show($id)
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function edit($id)
+    public function edit($gjid)
     {
-        $user = GJUser::find($id)->first();
+        $user = GJUser::where('gjid', $gjid)->first();
+        abort_unless($user, 403);
         return view('user.edit')->with('user', $user);
     }
 
@@ -73,12 +74,13 @@ public function edit($id)
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, $gjid)
     {
         $request->validate([
             'is_admin' => ['required', 'boolean']
         ]);
-        $user = GJUser::find($id)->first();
+        $user = GJUser::where('gjid', $gjid)->first();
+        abort_unless($user, 403);
         $user->is_admin = $request->is_admin;
         $user->save();
         return redirect()->route('users')->with('success', 'User saved.');

diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php
@@ -21,7 +21,7 @@
                         <td>{{ $user->gjid }}</td>
                         <td>{{ $user->gju }}</td>
                         <td>{{ ($user->is_admin) ? 'Yes' : 'No' }}</td>
-                        <td><a class="btn btn-warning" href="{{ route('user-edit', $user->id) }}"><i class="fas fa-edit"></i> Edit</a></td>
+                        <td><a class="btn btn-warning" href="{{ route('user-edit', $user->gjid) }}"><i class="fas fa-edit"></i> Edit</a></td>
                     </tr>
                 @endforeach
             </tbody>

diff --git a/routes/web.php b/routes/web.php
@@ -30,5 +30,5 @@
 Route::post('/skin/delete/{id}', [SkinController::class, 'destroyAsAdmin'])->name('skin-destroy-admin');
 
 Route::get('/users', [UserController::class, 'index'])->name('users');
-Route::get('/user/edit/{id}', [UserController::class, 'edit'])->name('user-edit');
-Route::post('/user/edit/{id}', [UserController::class, 'update'])->name('user-update');
+Route::get('/user/edit/{gjid}', [UserController::class, 'edit'])->name('user-edit');
+Route::post('/user/edit/{gjid}', [UserController::class, 'update'])->name('user-update');