From 82e0b1ffd84289130469c8ee7c2ce8f1adcf1add Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 8 Sep 2020 18:29:02 -0700 Subject: [PATCH] Fixed [ch15130] - update the seeder to clear requested assets table --- database/seeds/DatabaseSeeder.php | 2 ++ resources/views/account/accept/index.blade.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 338724b65..f90326c05 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -49,6 +49,8 @@ class DatabaseSeeder extends Seeder DB::table('imports')->truncate(); DB::table('asset_maintenances')->truncate(); + DB::table('requested_assets')->truncate(); + } } diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php index 4a699ea4f..aeab72a29 100755 --- a/resources/views/account/accept/index.blade.php +++ b/resources/views/account/accept/index.blade.php @@ -41,7 +41,7 @@ Accept assets {{ $user->present()->fullName() }} @foreach ($acceptances as $acceptance) - {{ $acceptance->checkoutable->present()->name }} + {{ ($acceptance->checkoutable) ? $acceptance->checkoutable->present()->name : '' }} Accept/Decline @endforeach