Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

2020-08-31 13:20:57 +02:00
parent f29fe0180a b6f4fdb138
commit a6ffea7016
3 changed files with 16 additions and 10 deletions
@@ -237,9 +237,8 @@ class EventController extends Controller
                $userEvent->delete();
            }

-            $news = News::query()->where("type_id", "=", "3")->where("arrangement_id", "=", $event->id)->first();
-            if($news !== null)
-                $news->delete();
+            $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->where("type", "=", "Activity")->where("arrangement_id", "=", $id);
+            $news->delete();

            $event->delete();