From 6f38f76e4a1c09a3dcbfa6db6dcb56f03f083c12 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 14 Mar 2015 02:45:49 -0700
Subject: [PATCH] Haha - TOTALLY cheated. But it works. Fixed ordering for
 linked names

---
 app/config/version.php                     |  4 ++--
 app/controllers/admin/AssetsController.php | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index 7abcb02a5a93..f067758d7b3e 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-34',
-  'hash_version' => 'v1.2.6.1-34-g4243710',
+  'app_version' => 'v1.2.6.1-37',
+  'hash_version' => 'v1.2.6.1-37-gf6141e5',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 0c367fb1d1e5..ae3ba2df4190 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -936,14 +936,12 @@ public function getDatatable($status = null)
         
         return Datatable::collection($assets)
         ->addColumn('',function($assets)
-            {
-                                
-                    return '<input type="checkbox" name="edit_asset['.$assets->id.']" class="one_required">';
-                
+            {                              
+                return '<input type="checkbox" name="edit_asset['.$assets->id.']" class="one_required">';                
             })
         ->addColumn('name',function($assets)
 	        {
-		        return link_to('hardware/'.$assets->id.'/view', $assets->name);
+		        return '<a title="'.$assets->name.'" href="hardware/'.$assets->id.'/view">'.$assets->name.'</a>';
 	        })	
 	        
         ->showColumns('asset_tag', 'serial')
@@ -985,7 +983,7 @@ public function getDatatable($status = null)
 		 ->addColumn('checkout_date',function($assets)
 	        {	
 		        	if (($assets->assigned_to!='') && ($assets->assetlog->first())) {
-			        	return $assets->assetlog->first()->created_at->format('M d, Y');
+			        	return $assets->assetlog->first()->created_at->format('Y-m-d');
 			        } 
 	            
 	        })