DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 15:44:11 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2017-11-22 18:43:15 -08:00
parent ba04c64567 76e3398d44
commit 9dba1bb3e5
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/ReportsController.php
View file

@ -183,8 +183,8 @@ class ReportsController extends Controller
($asset->purchase_cost > 0) ? Helper::formatCurrencyOutput($asset->purchase_cost) : '',
($asset->order_number) ? e($asset->order_number) : '',
($asset->supplier) ? e($asset->supplier->name) : '',
($asset->checkedOutToUser()) ? e($asset->assigned->getFullNameAttribute()) : ($asset->assigned ? e($asset->assigned->display_name) : ''),
($asset->checkedOutToUser()) ? 'user' : e($asset->assignedType()),
($asset->checkedOutToUser() && $asset->assigned) ? e($asset->assigned->getFullNameAttribute()) : ($asset->assigned ? e($asset->assigned->display_name) : ''),
($asset->checkedOutToUser() && $asset->assigned) ? 'user' : e($asset->assignedType()),
($asset->last_checkout!='') ? e($asset->last_checkout) : '',
($asset->location) ? e($asset->location->name) : '',
($asset->notes) ? e($asset->notes) : '',

12
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v4.1.6',
'full_app_version' => 'v4.1.6 - build 2958-g8c8352e',
'build_version' => '2958',
'app_version' => 'v4.1.6-pre',
'full_app_version' => 'v4.1.6-pre - build 2783-gba04c64',
'build_version' => '2783',
'prerelease_version' => '',
'hash_version' => 'g8c8352e',
'full_hash' => 'v4.1.5-52-g8c8352e',
'branch' => 'master',
'hash_version' => 'gba04c64',
'full_hash' => 'v4.1.5-53-gba04c64',
'branch' => 'develop',
);