Fixed bug in views for created_at date

snipe · Nov 19, 2013 · d6a718e · d6a718e
1 parent 8daffa8
commit d6a718e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/app/views/backend/assets/view.blade.php b/app/views/backend/assets/view.blade.php
@@ -48,7 +48,7 @@
                         <div class="profile-box">
                             <br>
                             <!-- checked out assets table -->
-                            @if (count($asset->assetlog) > 0)
+
                             <table class="table table-hover">
                                 <thead>
                                     <tr>
@@ -60,6 +60,7 @@
                                     </tr>
                                 </thead>
                                 <tbody>
+                                @if (count($asset->assetlog) > 0)
 									@foreach ($asset->assetlog as $log)
 									<tr>
 										<td>
@@ -84,9 +85,10 @@
 										</td>
 									</tr>
 									@endforeach
+									@endif
 									<tr>
 										<td></td>
-										<td>{{ $asset->created_on }}</td>
+										<td>{{ $asset->created_at }}</td>
 										<td>{{ $asset->adminuser->fullName() }}</td>
 										<td>created asset</td>
 										<td></td>
@@ -95,15 +97,6 @@
 									</tr>
                                 </tbody>
                             </table>
-                            @else
-
-                            <div class="col-md-6">
-								<div class="alert alert-warning alert-block">
-									<i class="icon-warning-sign"></i>
-									@lang('admin/users/table.noresults')
-								</div>
-							</div>
-                            @endif
 
                         </div>
                     </div>

diff --git a/app/views/backend/licenses/view.blade.php b/app/views/backend/licenses/view.blade.php
@@ -46,7 +46,7 @@
                         <div class="profile-box">
                             <br>
                             <!-- checked out assets table -->
-                            @if (count($license->assetlog) > 0)
+
                             <table class="table table-hover">
                                 <thead>
                                     <tr>
@@ -58,6 +58,7 @@
                                     </tr>
                                 </thead>
                                 <tbody>
+                                	@if (count($license->assetlog) > 0)
 									@foreach ($license->assetlog as $log)
 									<tr>
 										<td>
@@ -82,26 +83,18 @@
 										</td>
 									</tr>
 									@endforeach
+									@endif
 									<tr>
 										<td></td>
-										<td>{{ $license->created_on }}</td>
+										<td>{{ $license->created_at }}</td>
 										<td>{{ $license->adminuser->fullName() }}</td>
 										<td>created asset</td>
 										<td></td>
-
-
 									</tr>
                                 </tbody>
                             </table>
-                            @else
-
-                            <div class="col-md-6">
-								<div class="alert alert-warning alert-block">
-									<i class="icon-warning-sign"></i>
-									@lang('admin/users/table.noresults')
-								</div>
-							</div>
-                            @endif
+
+
 
                         </div>
                     </div>