Compare commits

...

6 Commits

Author SHA1 Message Date
snipe 5265821bcc Bumped version 2017-05-18 22:24:03 -07:00
snipe cb494a74ca Merge branch 'master' of github.com:snipe/snipe-it 2017-05-18 22:20:57 -07:00
snipe c526ffbf68 Bumped version 2017-05-18 22:20:52 -07:00
snipe 6f5fe83a91 Fixed missing language string in asset display 2017-05-18 22:20:43 -07:00
Nate Felton 5a3816c907 Fixing a regression for RHEL 6 with snipe/snipe-it#2993 (#3572) 2017-05-12 17:19:41 -07:00
snipe c8796cf045 Only prompt for checkin if there is an assigned user 2017-05-10 03:37:30 -07:00
4 changed files with 6 additions and 7 deletions
+1 -1
View File
@@ -1802,7 +1802,7 @@ class AssetsController extends Controller
}
} else {
if (Gate::allows('assets.checkin')) {
if (($asset->assigned_to!='') && (Gate::allows('assets.checkin'))) {
$inout = '<a href="' . route('checkin/hardware',
$asset->id) . '" class="btn btn-primary btn-sm" title="Checkin this asset" data-toggle="tooltip">' . trans('general.checkin') . '</a>';
}
+2 -2
View File
@@ -1,7 +1,7 @@
<?php
return array (
'app_version' => 'v3.6.5',
'app_version' => 'v3.6.6',
'build_version' => '1',
'hash_version' => 'gee2c67a',
'full_hash' => 'v3.6.5-gee2c67a',
'full_hash' => 'v3.6.6-gee2c67a',
);
@@ -14,6 +14,7 @@ return array(
'cost' => 'Purchase Cost',
'create' => 'Create Asset',
'date' => 'Purchase Date',
'depreciation' => 'Depreciation',
'depreciates_on' => 'Depreciates On',
'default_location' => 'Default Location',
'eol_date' => 'EOL Date',
+2 -4
View File
@@ -111,10 +111,8 @@ function isinstalled {
}
if [ -f /etc/lsb-release ]; then
. /etc/lsb-release
distro="${DISTRIB_ID,,}"
version="$DISTRIB_RELEASE"
codename="$DISTRIB_CODENAME"
distro="$(lsb_release -s -i )"
version="$(lsb_release -s -r)"
elif [ -f /etc/os-release ]; then
distro="$(. /etc/os-release && echo $ID)"
version="$(. /etc/os-release && echo $VERSION_ID)"