Merge pull request #875 from cachethq/admin-delete-users

Added the ability for admins to delete users. Closes #791

app/Http/Controllers/Admin/TeamController.php

@@ -106,4 +106,19 @@ class TeamController extends Controller
         return Redirect::back()
             ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.team.edit.success')));
     }
+
+    /**
+     * Delete a user.
+     *
+     * @param \CachetHQ\Cachet\Models\User $user
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function deleteUser(User $user)
+    {
+        $user->delete();
+
+        return Redirect::route('dashboard.team')
+            ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.team.delete.success')));
+    }
 }

app/Http/Routes/AdminRoutes.php

@@ -177,6 +177,7 @@ class AdminRoutes
                     $router->get('{user}', 'TeamController@showTeamMemberView');
                     $router->post('add', 'TeamController@postAddUser');
                     $router->post('{user}', 'TeamController@postUpdateUser');
+                    $router->delete('{user}/delete', 'TeamController@deleteUser');
                 });
             });
 

resources/lang/en/dashboard.php

@@ -149,6 +149,10 @@ return [
             'success' => 'Profile updated.',
             'failure' => 'Something went wrong when updating.',
         ],
+        'delete' => [
+            'success' => 'User updated.',
+            'failure' => 'Something went wrong when deleting this user.',
+        ],
     ],
 
     // Settings

resources/views/dashboard/team/edit.blade.php

@@ -33,7 +33,10 @@
                     <div class="form-group">
                         <button type="submit" class="btn btn-success">{{ trans('forms.update') }}</button>
                         @if($current_user->isAdmin)
-                        <a class="btn btn-danger" href="/dashboard/user/{{ $user->id }}/api/regen">{{ trans('cachet.api.revoke') }}</a>
+                        <a class="btn btn-info" href="/dashboard/user/{{ $user->id }}/api/regen">{{ trans('cachet.api.revoke') }}</a>
+                        @if($current_user->id != $user->id)
+                        <a class="btn btn-danger confirm-action" href="/dashboard/team/{{ $user->id }}/delete" data-method="DELETE">{{ trans('forms.delete') }}</a>
+                        @endif
                         @endif
                     </div>
                 </form>