v1.5.20a - Fixed event destroy

skolehjem/app/Http/Controllers/EventController.php

@@ -120,7 +120,7 @@ class EventController extends Controller
     public function signups(Request $request)
     {
         // Find every event you have clicked on. And find all users to that event, and the event name itself.
-        $events = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('events', 'events.id', '=', 'user_events.event_id')->where('event_id', $request->event)->get();
+        $events = UserEvent::join('users', 'users.id', '=', 'user_events.user_id')->join('events', 'events.id', '=', 'user_events.event_id')->where('event_id', $request->event)->select('user_events.*', 'users.name_first', 'users.name_last', 'users.phone')->get();
 
         if (count($events) == 0)
             $events = Event::where('id', $request->event)->get();
@@ -213,11 +213,11 @@ class EventController extends Controller
     public function destroy(Request $request, $id)
     {
         if ($request->signup != null) { // If input signup is not empty, which has been set when you look at the individuel signup, then delete the user who have signed up for the event
-            $UserEvent = UserEvent::query()->where('user_id', "=", $request->signup)->where('event_id', "=", $id);
+            $UserEvent = UserEvent::find($id);
 
             $UserEvent->delete();
 
-            return redirect()->route("events.signups", [ "event" => $id ]);
+            return 1;
         } else { // Else if you are deleting an event. Then delete all the sign ups AND the event
             $userEvents = UserEvent::query()->where('event_id', "=", $id)->get();
             $event = Event::query()->find($id);