DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 05:47:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2185 from dmeltzer/slack-fixes

Browse source 
A few slack fixes
This commit is contained in:
snipe 2016-06-21 15:45:22 -07:00 committed by GitHub
parent 508e7acb54 f004facb06
commit dcdc1a6e7b
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();
if ($settings->slack_endpoint) {

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

@ -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:',