Haha - TOTALLY cheated. But it works. Fixed ordering for linked names

snipe · Mar 14, 2015 · 6f38f76 · 6f38f76
1 parent 5cfb2d5
commit 6f38f76
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git 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',
 );
diff --git 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');
 			        } 
 
 	        })