From 005cf821c9d783b76548f73f1133fc71bb945cb9 Mon Sep 17 00:00:00 2001 From: victor Date: Mon, 26 Oct 2020 14:59:16 +0100 Subject: [PATCH] v1.4.8e Fixed so when you edit a guide or a event the images gets added and its not just blank for some strange reason, but you cant edit images yet . --- skolehjem/app/Http/Controllers/EventController.php | 6 ++++++ skolehjem/app/Http/Controllers/GuideController.php | 4 ++++ skolehjem/resources/views/admin/events/edit.blade.php | 2 ++ skolehjem/resources/views/admin/guides/edit.blade.php | 5 ++--- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index fab97b0..1227237 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -193,8 +193,14 @@ class EventController extends Controller $news->subname = $event->name; $news->arrangement_id = $event->id; $news->type_id = '3'; + $news->resource_id = $event->resource_id; $news->content = "

" . $this->closetags(substr($event->description, 0, 300)); + if($request->file("resource")) { + $event->resource_id = ResourceController::store($request)->id; + } + + NewsController::storeAndGet($news); } diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php index 9a44efd..62f3f79 100644 --- a/skolehjem/app/Http/Controllers/GuideController.php +++ b/skolehjem/app/Http/Controllers/GuideController.php @@ -149,6 +149,10 @@ class GuideController extends Controller $news->arrangement_id = $guide->id; $news->type_id = '4'; + if($guide->resource_id !== null) + $news->resource_id = $guide->resource_id; + + $news->content = $this->closetags(substr($guidee->guide_articles, 0, 300)); NewsController::storeAndGet($news); diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php index ee48090..981f128 100644 --- a/skolehjem/resources/views/admin/events/edit.blade.php +++ b/skolehjem/resources/views/admin/events/edit.blade.php @@ -38,6 +38,8 @@ + +

{!! $guide->guide_articles !!}
- - - + +