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

Conflicts: skolehjem/app/Http/Controllers/MenuPlanController.php
2020-08-12 15:28:15 +02:00
parent fff03fd131 0886c8f583
commit 5c871c3fb7
37 changed files with 582 additions and 244 deletions
@@ -60,6 +60,7 @@ class NewsController extends Controller

        $news = new News($data);
        $news->name = "";
+        $news->type_id = '1';
        $news->save();

        Helpers::sendNewsNotification($news, User::all());
@@ -115,7 +116,7 @@ class NewsController extends Controller
    public function update(Request $request, News $news)
    {
        $data = $request->validate([
-            "name" => "required",
+            "subname" => "required",
            "content" => "required"
        ]);