DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix in case crated_at is blank

Browse source
This commit is contained in:
snipe 2016-06-21 17:19:46 -07:00
parent dcdc1a6e7b
commit dd1241f964
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/views/hardware/view.blade.php
View file

@ -249,10 +249,14 @@
<td>{{ trans('admin/hardware/form.notes') }}</td> <td>{{ trans('admin/hardware/form.notes') }}</td>
<td>{{ $asset->notes }}</td> <td>{{ $asset->notes }}</td>
</tr> </tr>
@if ($asset->created_at)
<tr> <tr>
<td>{{ trans('general.created_at') }}</td> <td>{{ trans('general.created_at') }}</td>
<td>{{ $asset->created_at->format('F j, Y h:iA') }}</td> <td>
{{ $user->created_at->format('F j, Y h:iA') }}
</td>
</tr> </tr>
@endif
</tbody> </tbody>
</table> </table>
</div> <!-- /table-responsive --> </div> <!-- /table-responsive -->

6
resources/views/users/view.blade.php
View file

@ -111,10 +111,14 @@
<td>{{ $user->userloc->name }}</td> <td>{{ $user->userloc->name }}</td>
</tr> </tr>
@endif @endif
@if ($user->created_at)
<tr> <tr>
<td>{{ trans('general.created_at') }}</td> <td>{{ trans('general.created_at') }}</td>
<td>{{ $user->created_at->format('F j, Y h:iA') }}</td> <td>
{{ $user->created_at->format('F j, Y h:iA') }}
</td>
</tr> </tr>
@endif
</table> </table>
</div> </div>