From 016613b469eaec3a1204a34ad75c762d9c968d0d Mon Sep 17 00:00:00 2001
From: Neerholt <vict3459@edu.sde.dk>
Date: Wed, 1 Jul 2020 09:16:53 +0200
Subject: [PATCH] Fix

---
 .../Http/Controllers/MenuPlanController.php   |  9 ++++++--
 .../app/Http/Controllers/RolesController.php  | 21 +++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php
index d6e334b..7707dc1 100644
--- a/skolehjem/app/Http/Controllers/MenuPlanController.php
+++ b/skolehjem/app/Http/Controllers/MenuPlanController.php
@@ -60,9 +60,14 @@ class MenuPlanController extends Controller
         ]);
 
         $menuPlans = new MenuPlan($requestMenuPlanCreate);
-        $menuPlans->save();
+        $saved = $menuPlans->save();
 
-        return Response::detect("menuplans.store");
+        if(!$saved){
+            return Response::detect("menuplans.store");
+        }else{
+            $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
+            return Response::detect("menuplans.index", ['menuplan' => $menuPlans]);
+        }
     }
 
     /**
diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php
index 6f58467..093cbe8 100644
--- a/skolehjem/app/Http/Controllers/RolesController.php
+++ b/skolehjem/app/Http/Controllers/RolesController.php
@@ -45,9 +45,16 @@ class rolesController extends Controller
         ]);
 
         $role = new Role($requestRole);
-        $role->save();
+        $saved = $role->save();
+
+        if(!$saved){
+            return Response::detect("roles.store");
+        }else{
+            $roles = Role::query()->paginate($request->input("limit", 20));
+            return Response::detect("roles.index", ['roles' => $roles]);
+        }
+
 
-        return Response::detect("roles.store");
     }
 
     /**
@@ -85,9 +92,15 @@ class rolesController extends Controller
         $data = $request->all();
         $role = Role::find($id);
         $role->update($data);
-        $role->save();
+        $saved = $role->save();
+
+        if(!$saved){
+            return Response::detect("roles.update", [ "role" => $role ]);
+        }else{
+            $roles = Role::query()->paginate($request->input("limit", 20));
+            return Response::detect("roles.index", ['roles' => $roles]);
+        }
 
-        return Response::detect("roles.update", [ "role" => $role ]);
     }
 
     /**