From f004facb06af2fc1707771fe015e86d8d0c3c39f Mon Sep 17 00:00:00 2001 From: Daniel Meltzer Date: Tue, 21 Jun 2016 09:41:05 -0400 Subject: [PATCH] A few slack fixes 1) Missing $admin_user in AccessoriesController::postCheckout(). Fixes #2183 2) AssetsController::postCheckin used the hardware url for the user link, not the user url --- app/Http/Controllers/AccessoriesController.php | 1 + app/Http/Controllers/AssetsController.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AccessoriesController.php b/app/Http/Controllers/AccessoriesController.php index 87e301007d..b47149a773 100755 --- a/app/Http/Controllers/AccessoriesController.php +++ b/app/Http/Controllers/AccessoriesController.php @@ -322,6 +322,7 @@ class AccessoriesController extends Controller + $admin_user = Auth::user(); $settings = Setting::getSettings(); if ($settings->slack_endpoint) { diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php index 53a7c2b2e8..7ff82379cc 100755 --- a/app/Http/Controllers/AssetsController.php +++ b/app/Http/Controllers/AssetsController.php @@ -611,7 +611,7 @@ class AssetsController extends Controller 'fields' => [ [ 'title' => 'Checked In:', - 'value' => strtoupper($logaction->asset_type).' asset <'.config('app.url').'/hardware/'.$asset->id.'/view'.'|'.e($asset->showAssetName()).'> checked in by <'.config('app.url').'/hardware/'.$asset->id.'/view'.'|'.e(Auth::user()->fullName()).'>.' + 'value' => strtoupper($logaction->asset_type).' asset <'.config('app.url').'/hardware/'.$asset->id.'/view'.'|'.e($asset->showAssetName()).'> checked in by <'.config('app.url').'/admin/users/'.Auth::user()->id.'/view'.'|'.e(Auth::user()->fullName()).'>.' ], [ 'title' => 'Note:',