Small EOL fix

snipe · Jul 28, 2015 · 679b9f6 · 679b9f6
1 parent 87cd77b
commit 679b9f6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
@@ -1113,7 +1113,7 @@ public function getDatatable($status = null)
             'status'    => ($asset->assigned_to!='') ? link_to('../admin/users/'.$asset->assigned_to.'/view', $asset->assigneduser->fullName()) : (($asset->assetstatus) ? $asset->assetstatus->name : ''),
             'location'  => (($asset->assigned_to)&&($asset->assigneduser->userloc!='')) ? link_to('admin/settings/locations/'.$asset->assigneduser->userloc->id.'/edit', $asset->assigneduser->userloc->name) : (($asset->defaultLoc!='') ? link_to('admin/settings/locations/'.$asset->defaultLoc->id.'/edit', $asset->defaultLoc->name) : ''),
             'category'  => ($asset->model->category) ? $asset->model->category->name : 'No category',
-            'eol'       => $asset->eol_date(),
+            'eol'       => ($asset->eol_date()) ? $asset->eol_date() : '',
             'notes'     => $asset->notes,
             'order'     => ($asset->order_number) ? '<a href="../hardware/?order_number='.$asset->order_number.'">'.$asset->order_number.'</a>' : '',
             'checkout_date' => (($asset->assigned_to!='')&&($asset->assetlog->first())) ? $asset->assetlog->first()->created_at->format('Y-m-d') : '',