From e88a81141fd1d8929412e0e32a17cdfa8d53acd1 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 2 Apr 2015 15:40:41 -0700
Subject: [PATCH] Added view link to asset tag, since some assets won't have
 names

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

diff --git a/app/config/version.php b/app/config/version.php
index 93c17821d8..b2503ccce8 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-184',
-  'hash_version' => 'v1.2.6.1-184-g766afde',
+  'app_version' => 'v1.2.6.1-185',
+  'hash_version' => 'v1.2.6.1-185-g33e7ce6',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 655f69d77f..fe2e40cf68 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -979,8 +979,12 @@ class AssetsController extends AdminController
 	        {
 		        return '<a title="'.$assets->name.'" href="hardware/'.$assets->id.'/view">'.$assets->name.'</a>';
 	        })	
+	    ->addColumn('asset_tag',function($assets)
+	        {
+		        return '<a title="'.$assets->asset_tag.'" href="hardware/'.$assets->id.'/view">'.$assets->asset_tag.'</a>';
+	        })	
 	        
-        ->showColumns('asset_tag', 'serial')
+        ->showColumns('serial')
         
 		->addColumn('model',function($assets)
 			{