From 016613b469eaec3a1204a34ad75c762d9c968d0d Mon Sep 17 00:00:00 2001 From: Neerholt Date: Wed, 1 Jul 2020 09:16:53 +0200 Subject: [PATCH 1/3] 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 ]); } /** From 7b4610f02fc750754592f217757696cfa18e18c7 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Wed, 1 Jul 2020 09:43:11 +0200 Subject: [PATCH 2/3] Fix --- .../app/Http/Controllers/EventController.php | 20 +++++++++++++++---- .../Controllers/ExternalLinkController.php | 20 +++++++++++++++---- .../Http/Controllers/MenuPlanController.php | 12 ++++++++--- .../views/admin/external-links/edit.blade.php | 2 +- 4 files changed, 42 insertions(+), 12 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 0e98754..55866ba 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -59,9 +59,15 @@ class EventController extends Controller $event = new Event($requestBody); - $event->save(); + $saved = $event->save(); + + if(!$saved){ + return Response::detect("events.store"); + }else{ + $event = Event::query()->paginate($request->input("limit", 20)); + return Response::detect("events.index", ['events' => $event]); + } - return Response::detect("events.store"); } /** @@ -100,9 +106,15 @@ class EventController extends Controller $event = Event::find($id); $event->update($data); - $event->save(); + $saved = $event->save(); + + if(!$saved){ + return Response::detect("events.update", [ "event" => $event]); + }else{ + $event = Event::query()->paginate($request->input("limit", 20)); + return Response::detect("events.index", ['events' => $event]); + } - return Response::detect("events.update", [ "event" => $event]); } /** diff --git a/skolehjem/app/Http/Controllers/ExternalLinkController.php b/skolehjem/app/Http/Controllers/ExternalLinkController.php index 8f99398..3b3b9a7 100644 --- a/skolehjem/app/Http/Controllers/ExternalLinkController.php +++ b/skolehjem/app/Http/Controllers/ExternalLinkController.php @@ -55,9 +55,15 @@ class ExternalLinkController extends Controller ]); $externalLink = new ExternalLink($requestBody); - $externalLink->save(); + $saved = $externalLink->save(); + + if(!$saved){ + return Response::detect("external-links.store"); + }else{ + $externalLink = ExternalLink::query()->paginate($request->input("limit", 20)); + return Response::detect("external-links.index", ['links' => $externalLink]); + } - return Response::detect("external-links.store"); } /** @@ -96,9 +102,15 @@ class ExternalLinkController extends Controller $link = ExternalLink::find($id); $link->update($data); - $link->save(); + $saved = $link->save(); + + if(!$saved){ + return Response::detect("external-links.update", [ "link" => $link]); + }else{ + $externalLink = ExternalLink::query()->paginate($request->input("limit", 20)); + return Response::detect("external-links.index", ['links' => $externalLink]); + } - return Response::detect("external-links.update", [ "link" => $link]); } /** diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 7707dc1..27db7c0 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -66,7 +66,7 @@ class MenuPlanController extends Controller return Response::detect("menuplans.store"); }else{ $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20)); - return Response::detect("menuplans.index", ['menuplan' => $menuPlans]); + return Response::detect("menuplans.index", ['menuPlans' => $menuPlans]); } } @@ -107,9 +107,15 @@ class MenuPlanController extends Controller $menuplan = MenuPlan::find($id); $menuplan->update($data); - $menuplan->save(); + $saved = $menuplan->save(); + + if(!$saved){ + return Response::detect("menuplans.update", [ "menuplan" => $menuplan ]); + }else{ + $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20)); + return Response::detect("menuplans.index", ['menuPlans' => $menuPlans]); + } - return Response::detect("menuplans.update", [ "menuplan" => $menuplan ]); } /** diff --git a/skolehjem/resources/views/admin/external-links/edit.blade.php b/skolehjem/resources/views/admin/external-links/edit.blade.php index 027e71e..250ec21 100644 --- a/skolehjem/resources/views/admin/external-links/edit.blade.php +++ b/skolehjem/resources/views/admin/external-links/edit.blade.php @@ -15,7 +15,7 @@ @csrf @method("PUT") - + From eb4851454583c1c3ffd3dff50f80f92dde72f4b4 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Wed, 1 Jul 2020 09:50:37 +0200 Subject: [PATCH 3/3] Made it so you get send to index after you make,edit and update user information --- .../Http/Controllers/ContactController.php | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index f71dc01..e649834 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Http\Response; use App\Contact; +use phpDocumentor\Reflection\Types\Context; class ContactController extends Controller { @@ -59,9 +60,15 @@ class ContactController extends Controller ]); $contact = new Contact($requestContact); - $contact->save(); + $saved = $contact->save(); + + if(!$saved){ + return Response::detect("contacts.store"); + }else{ + $contact = Contact::query()->paginate($request->input("limit", 20)); + return Response::detect("contacts.index", ['contacts' => $contact]); + } - return Response::detect("contacts.store"); } /** @@ -101,9 +108,15 @@ class ContactController extends Controller $data = $request->all(); $contact = Contact::find($id); $contact->update($data); - $contact->save(); + $saved = $contact->save(); + + if(!$saved){ + return Response::detect("contacts.update", [ "contacts" => $contact ]); + }else{ + $contact = Contact::query()->paginate($request->input("limit", 20)); + return Response::detect("contacts.index", ['contacts' => $contact]); + } - return Response::detect("contacts.update", [ "contacts" => $contact ]); } /**