From d016ea6c4c57eafa05ee2ef546d037b66feb8a97 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Wed, 12 Aug 2020 12:49:05 +0200 Subject: [PATCH] v0.8.4a - Added last support for images uploade --- skolehjem/app/Guide.php | 2 +- skolehjem/app/Http/Controllers/GuideController.php | 6 +++++- .../2020_08_04_062259_create_guides_table.php | 1 + .../resources/views/admin/guides/create.blade.php | 4 +++- skolehjem/resources/views/app/guides/index.blade.php | 10 ++++++++-- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/skolehjem/app/Guide.php b/skolehjem/app/Guide.php index 476998f..86730ee 100644 --- a/skolehjem/app/Guide.php +++ b/skolehjem/app/Guide.php @@ -7,6 +7,6 @@ use Illuminate\Database\Eloquent\Model; class Guide extends Model { protected $fillable = [ - 'name', 'guide_articles' + 'name', 'guide_articles','resource_id' ]; } diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php index a4e25b1..d1f9887 100644 --- a/skolehjem/app/Http/Controllers/GuideController.php +++ b/skolehjem/app/Http/Controllers/GuideController.php @@ -63,7 +63,11 @@ class GuideController extends Controller "guide_articles" => "required", ]); + $guide = new Guide($requestGuide); + if($request->file("resource")) { + $guide->resource_id = ResourceController::store($request)->id; + } $saved = $guide->save(); if(!$saved){ @@ -78,7 +82,7 @@ class GuideController extends Controller $news->subname = $guide->name; $news->content = $this->closetags(substr($guide->guide_articles, 0, 300)). '
$guide]). '" class="sde-blue ">Læs mere'; - + $news->resource_id = $guide->resource_id; $news->save(); } diff --git a/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php b/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php index e602214..d18ba53 100644 --- a/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php +++ b/skolehjem/database/migrations/2020_08_04_062259_create_guides_table.php @@ -18,6 +18,7 @@ class CreateGuidesTable extends Migration $table->timestamps(); $table->string('name'); $table->longText('guide_articles'); + $table->foreignId('resource_id')->nullable()->constrained('resources', 'id'); }); } diff --git a/skolehjem/resources/views/admin/guides/create.blade.php b/skolehjem/resources/views/admin/guides/create.blade.php index 4384e31..00d663d 100644 --- a/skolehjem/resources/views/admin/guides/create.blade.php +++ b/skolehjem/resources/views/admin/guides/create.blade.php @@ -24,7 +24,7 @@

Opret Vejledning

-
+ @csrf @@ -36,6 +36,8 @@ Opret som nyhed + +
diff --git a/skolehjem/resources/views/app/guides/index.blade.php b/skolehjem/resources/views/app/guides/index.blade.php index fae3410..31a4630 100644 --- a/skolehjem/resources/views/app/guides/index.blade.php +++ b/skolehjem/resources/views/app/guides/index.blade.php @@ -37,9 +37,15 @@ @if(!$guides->isEmpty()) @foreach($guides as $guide)
-
-

{{ $guide->name}}

+ @if($guide->resource_id !== null) +
+

{{ $guide->name}}

+ @else +
+

{{ $guide->name}}

+
+ @endif
{!! \App\Helpers::closetags(substr($guide->guide_articles, 0, 300)) !!} $guide->id ])}}">Læs mere