From bb1aade94788482356d04d772be1ed7378014c97 Mon Sep 17 00:00:00 2001 From: frederikpyt <frederikpyt@gmail.com> Date: Mon, 10 Aug 2020 12:07:41 +0200 Subject: [PATCH] v0.5.15h - Fixed bugs --- skolehjem/app/Http/Controllers/EventController.php | 4 ++-- .../migrations/2020_06_29_065007_create_contact.php | 2 +- skolehjem/database/seeds/ContactSeeder.php | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 48b316d..c6076ac 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -85,7 +85,7 @@ class EventController extends Controller $news->content = "<p>" . $this->closetags(substr($event->description, 0, 300)) . "</p>" . '<div class="row align-items-center">'. '<a style="width: 33%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'. - '<a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere...</a>'. + '<a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere</a>'. '<a style="width: 33%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.signups", ["event" => $event->id ]) .'">Se deltagere</a>'. '</div>'; $news->save(); @@ -182,7 +182,7 @@ class EventController extends Controller $news->content = "<p>" . $this->closetags(substr($event->description, 0, 300)). "</p>" . '<div class="row align-items-center">'. '<a style="width: 33%; margin: 0; padding: 0; font-weight: 700;" class="sde-blue" href="'. route("userevents.create", ["event_id" => $event->id ]) .'">Tilmeld</a>'. - '<a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere...</a>'. + '<a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere</a>'. '<a style="width: 33%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'. '</div>'; $news->save(); diff --git a/skolehjem/database/migrations/2020_06_29_065007_create_contact.php b/skolehjem/database/migrations/2020_06_29_065007_create_contact.php index 50f79d3..4767e73 100644 --- a/skolehjem/database/migrations/2020_06_29_065007_create_contact.php +++ b/skolehjem/database/migrations/2020_06_29_065007_create_contact.php @@ -21,7 +21,7 @@ class CreateContact extends Migration $table->string('contactname', 255); $table->string('title', 255); $table->string('email', 255); - $table->integer('phone'); + $table->integer('phone')->nullable(true); $table->string('phonetimes'); }); } diff --git a/skolehjem/database/seeds/ContactSeeder.php b/skolehjem/database/seeds/ContactSeeder.php index b63d9e9..6324cf2 100644 --- a/skolehjem/database/seeds/ContactSeeder.php +++ b/skolehjem/database/seeds/ContactSeeder.php @@ -30,28 +30,28 @@ class ContactSeeder extends Seeder 'contactname' => "Thomas Thomsen", 'email' => "thth@sde.dk", 'title' => "Kollegieassistent", - 'phone' => "", + 'phone' => null, 'phonetimes' => "", ], [ 'contactname' => "Anja Holm Brix", 'email' => "ahb@sde.dk", 'title' => "Kollegieassistent", - 'phone' => "", + 'phone' => null, 'phonetimes' => "", ], [ 'contactname' => "Britta Overgaard Brink Olsen", 'email' => "brio@sde.dk", 'title' => "Kollegieassistent", - 'phone' => "", + 'phone' => null, 'phonetimes' => "", ], [ 'contactname' => "Jesper Sandberg", 'email' => "jesa@sde.dk", 'title' => "Kollegieassistent", - 'phone' => "", + 'phone' => null, 'phonetimes' => "", ], ];