From 5f6925858b1cdde7756aa9ffe4bb7abe7df14cd9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 30 Apr 2015 18:54:34 -0700
Subject: [PATCH] Richer slack integrations

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

diff --git a/app/config/version.php b/app/config/version.php
index a1f745df34..34ab9bd46d 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
   'app_version' => 'v1.2.7-beta',
-  'hash_version' => 'v1.2.7-beta-2-g62b5ec5',
+  'hash_version' => 'v1.2.7-beta-3-gc95af84',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index bd379454be..233cd3c11c 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -460,12 +460,18 @@ class AssetsController extends AdminController
 						    'color' => 'good',
 						    'fields' => [
 						        [
-						            'title' => 'Asset Checked Out',
-						            'value' => strtoupper($logaction->asset_type).' asset '.$asset->showAssetName().' checked out to '.$logaction->userlog->fullName().' by '.Sentry::getUser()->fullName()
+						            'title' => 'Checked Out:',
+						            'value' => strtoupper($logaction->asset_type).' asset <'.Config::get('app.url').'/hardware/'.$asset->id.'/view'.'|'.$asset->showAssetName().'> checked out to <'.Config::get('app.url').'/admin/users/'.$user->id.'/view|'.$user->fullName().'> by <'.Config::get('app.url').'/hardware/'.$asset->id.'/view'.'|'.Sentry::getUser()->fullName().'>.'
 						        ],
+						        [
+						            'title' => 'Note:',
+						            'value' => $logaction->note
+						        ],
+
+						        
 						        				   
 						    ]
-						])->send('A new checkout has been posted');
+						])->send('Asset Checked Out');
 					
 					} catch (Exception $e) {
 						
@@ -574,12 +580,16 @@ class AssetsController extends AdminController
 						    'color' => 'good',
 						    'fields' => [
 						        [
-						            'title' => 'Asset Checked In',
-						            'value' => strtoupper($logaction->asset_type).' asset '.$asset->showAssetName().' checked in by '.Sentry::getUser()->fullName()
+						            'title' => 'Checked In:',
+						            'value' => strtoupper($logaction->asset_type).' asset <'.Config::get('app.url').'/hardware/'.$asset->id.'/view'.'|'.$asset->showAssetName().'> checked in by <'.Config::get('app.url').'/hardware/'.$asset->id.'/view'.'|'.Sentry::getUser()->fullName().'>.'
+						        ],
+						        [
+						            'title' => 'Note:',
+						            'value' => $logaction->note
 						        ],
 						        				   
 						    ]
-						])->send('A new checkin has been posted');
+						])->send('Asset Checked In');
 					
 					} catch (Exception $e) {