From 2244c60499d0e6f2737a1dc7e6898ed2d855e190 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 13 Mar 2015 20:32:47 -0700
Subject: [PATCH] Added category to output

---
 app/config/version.php                     |  4 ++--
 app/controllers/admin/AssetsController.php | 13 ++++++++++---
 app/models/Asset.php                       |  6 ------
 app/views/backend/hardware/index.blade.php |  1 +
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index 1aa2cb3022..48d8495a08 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.6.1-22',
-  'hash_version' => 'v1.2.6.1-22-g96e4072',
+  'app_version' => 'v1.2.6.1-24',
+  'hash_version' => 'v1.2.6.1-24-ge23c0cb',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index 7d7519561e..0fa7dac6bc 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -881,7 +881,7 @@ class AssetsController extends AdminController
     public function getDatatable($status = null)
     {
 
-       $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog','model')->Hardware();
+       $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog','model','model.category')->Hardware();
        
 
 			switch ($status) {
@@ -958,10 +958,17 @@ class AssetsController extends AdminController
 			    return $assets->model->name;
 			})	
 			
-			->addColumn('eol',function($assets)
+		->addColumn('category',function($assets)
+			{
+				return $assets->model->category->name;
+
+			})	
+			
+		->addColumn('eol',function($assets)
 			{
 			    return $assets->eol_date();
 			})	
+		
 			
 		 ->addColumn('checkout_date',function($assets)
 	        {	
@@ -972,7 +979,7 @@ class AssetsController extends AdminController
 	        })	
 		->addColumn($inout)     
 	    ->addColumn($actions)           
-        ->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout')
+        ->searchColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout','category')
         ->orderColumns('name', 'asset_tag', 'serial', 'model', 'status','location','eol','checkout_date', 'inout')
         ->make();
         
diff --git a/app/models/Asset.php b/app/models/Asset.php
index 373527e049..261e5eaa39 100755
--- a/app/models/Asset.php
+++ b/app/models/Asset.php
@@ -166,12 +166,6 @@ class Asset extends Depreciable
         return $this->belongsTo('Supplier','supplier_id');
     }
     
-    // FIXME
-    public function category()
-    {
-        return $this->belongsTo('Category','category_id');
-    }
-    
 
     public function months_until_eol()
     {
diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php
index 2af949b487..e0d2573e1c 100755
--- a/app/views/backend/hardware/index.blade.php
+++ b/app/views/backend/hardware/index.blade.php
@@ -62,6 +62,7 @@
     	Lang::get('admin/hardware/table.serial'), 
     	Lang::get('admin/hardware/table.status'),
     	Lang::get('admin/hardware/form.model'),
+    	Lang::get('general.category'),
     	Lang::get('admin/hardware/table.eol'),
     	Lang::get('admin/hardware/table.checkout_date'), 
     	Lang::get('admin/hardware/table.change'),