resolving item 4 of issue #202

matthiku · Apr 29, 2020 · 7aa4a22 · 7aa4a22
1 parent 646568c
commit 7aa4a22
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/Http/Controllers/Cspot/PlanController.php b/app/Http/Controllers/Cspot/PlanController.php
@@ -382,7 +382,8 @@ public function store(StorePlanRequest $request)
 
         // insert default service TIMES if requested
         $type = Type::find($plan->type_id);
-        if ( count($type) && ! isset($request->start) ) {
+        // (updated 29-04-2020 MKS as count($type) failed to work in PHP>7.4 + Laravel>6.x)
+        if ( $type && $type->id && ! isset($request->start) ) {
             // default end time is only the time of day. We need to combine this with the plan date
             $startTme = Carbon::parse(   $type->start);
             $endTime  = Carbon::parse(   $type->end  );

diff --git a/public/lastCommit.txt b/public/lastCommit.txt
@@ -1 +1 @@
-21 Apr 2020 01:04:19
+29 Apr 2020 11:09:43
diff --git a/resources/views/admin/files.blade.php b/resources/views/admin/files.blade.php
@@ -196,7 +196,7 @@ class="link fileshow-category-{{ $file->id }} hidden-xs-down">
                             {{-- linked song id 
                             --}}
                             <td class="limit-td-width">
-                                @if (Auth::user()->isEditor())
+                                @if ($file->song_id && Auth::user()->isEditor())
                                     <a title="Song Details" href="{{ route('songs.edit', $file->song_id) }}">{{ $file->song_id }}</a>
                                 @else
                                     {{ $file->song_id }}