v1.4.10 - Event, Guide & Menuplan pictures can now be updated and changed correctly (Menuplan is determined when creating, can't change picture later)

There is no longer a second news, when updating an event or such

Added Select2 when chosing roles for users

Removed guide button

skolehjem/app/Http/Controllers/EventController.php

@@ -172,6 +172,7 @@ class EventController extends Controller
      */
     public function update(Request $request, $id)
     {
+
         $data = $request->all();
 
         $event = Event::find($id);
@@ -182,6 +183,11 @@ class EventController extends Controller
             return redirect()->route("events.index", ['events' => $event]);
         }else{
             $event->update($data);
+
+            if($request->file("resource")) {
+                $event->resource_id = ResourceController::store($request)->id;
+            }
+
             $event->save();
 
             $events = Event::query()->get();
@@ -196,9 +202,6 @@ class EventController extends Controller
                 $news->resource_id = $event->resource_id;
                 $news->content = "<p>" . $this->closetags(substr($event->description, 0, 300));
 
-                if($request->file("resource")) {
-                    $event->resource_id = ResourceController::store($request)->id;
-                }
 
 
                 NewsController::storeAndGet($news);

skolehjem/app/Http/Controllers/GuideController.php

@@ -126,14 +126,16 @@ class GuideController extends Controller
      */
     public function update(Request $request, Guide $guide)
     {
-        $data = $request->validate([
-            "name" => "required|max:255",
-            "guide_articles" => "required",
-            "guide_category_id" => "required",
-        ]);
+        $data = $request->all();
 
         $guidee = Guide::query()->where("id", "=", $guide->id)->first();
         $guidee->update($data);
+
+        //If an image has been uploaded, store the file
+        if($request->file("resource")) {
+            $guidee->resource_id = ResourceController::store($request)->id;
+        }
+
         $saved = $guidee->save();
 
         if(!$saved){

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -76,8 +76,6 @@ class MenuPlanController extends Controller
             $menuPlan->save();
             $menuPlans = MenuPlan::query()->get();
 
-            $menuArray = [];
-
             if($request->newsoption == true){
                 $news = new News();
 
@@ -177,6 +175,10 @@ class MenuPlanController extends Controller
                     '<h2 class="ql-align-center"><strong>Torsdag:</strong></h2>'.
                     '<p class="ql-align-center">'.$menuplan->thursday.'</p>';
 
+                    $oldResourceID = News::query()->where('arrangement_id', '=', $menuplan->id)->first();
+
+                    if ($oldResourceID != null)
+                        $news->resource_id = $oldResourceID->resource_id;
 
                 NewsController::storeAndGet($news);
             }

skolehjem/app/Http/Controllers/NewsController.php

@@ -84,6 +84,10 @@ class NewsController extends Controller
      */
     public static function storeAndGet(News $news)
     {
+        $OldNews = News::query()->where('arrangement_id', "=", $news->arrangement_id);
+
+        $OldNews->delete();
+
         $news->save();
 
         Helpers::sendNewsNotification($news, User::query()->where("wants_emails", "=", true)->get());