Merge pull request #77 from ngmy/fix-error-after-deleting-user

Fix an error on the Deployments page after deleting a user
ngmy · May 15, 2017 · 4f36686 · 4f36686
2 parents 5e87e63 + a732e63
commit 4f36686
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/resources/views/deployments/index.blade.php b/resources/views/deployments/index.blade.php
@@ -44,7 +44,7 @@
                             <td>{{ $deployment->task }}</td>
                             <td>{{ $deployment->created_at }}</td>
                             <td>{{ $deployment->updated_at }}</td>
-                            <td>{{ $deployment->user->email }}</td>
+                            <td>{{ is_null($deployment->user) ? '' : $deployment->user->email }}</td>
                             <td>
                                 {!! link_to_route('projects.deployments.show', 'Show', [$project, $deployment->number], ['class' => 'btn btn-default']) !!}
                             </td>

diff --git a/resources/views/deployments/show.blade.php b/resources/views/deployments/show.blade.php
@@ -32,7 +32,7 @@
                     </tr>
                     <tr>
                         <th>Executed By</th>
-                        <td>{{ $deployment->user->email }}</td>
+                        <td>{{ is_null($deployment->user) ? '' : $deployment->user->email }}</td>
                     </tr>
                 </tbody>
             </table>

diff --git a/resources/views/emails/notification.blade.php b/resources/views/emails/notification.blade.php
@@ -9,7 +9,7 @@
 Finished At: {{ $deployment->updated_at }}
 
 
-Executed By: {{ $deployment->user->email }}
+Executed By: {{ is_null($deployment->user) ? '' : $deployment->user->email }}
 
 
 Deployment URL: {{ route('projects.deployments.show', [$project->id, $deployment->number]) }}