DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

A few slack fixes

Browse source 
1) Missing $admin_user in AccessoriesController::postCheckout().  Fixes #2183
2) AssetsController::postCheckin used the hardware url for the user link, not the user url
This commit is contained in:
Daniel Meltzer 2016-06-21 09:41:05 -04:00
parent 6165d804f9
commit f004facb06
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/AccessoriesController.php
View file

@ -322,6 +322,7 @@ class AccessoriesController extends Controller
$admin_user = Auth::user();
$settings = Setting::getSettings(); $settings = Setting::getSettings();
if ($settings->slack_endpoint) { if ($settings->slack_endpoint) {

2
app/Http/Controllers/AssetsController.php
View file

@ -611,7 +611,7 @@ class AssetsController extends Controller
'fields' => [ 'fields' => [
[ [
'title' => 'Checked In:', '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:', 'title' => 'Note:',