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

Merge remote-tracking branch 'origin/develop'

Browse source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2023-02-24 09:58:19 -08:00
parent 1415c8c6e2 95501bf57c
commit 8caf29975f
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Assets/BulkAssetsController.php
View file

@ -288,7 +288,8 @@ class BulkAssetsController extends Controller
foreach ($asset_ids as $asset_id) { foreach ($asset_ids as $asset_id) {
$asset = Asset::findOrFail($asset_id); $asset = Asset::findOrFail($asset_id);
$this->authorize('checkout', $asset); $this->authorize('checkout', $asset);
$error = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), null);
$error = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $asset->name, null);
if ($target->location_id != '') { if ($target->location_id != '') {
$asset->location_id = $target->location_id; $asset->location_id = $target->location_id;

1
app/Models/License.php
View file

@ -36,7 +36,6 @@ class License extends Depreciable
'purchase_date' => 'datetime', 'purchase_date' => 'datetime',
'expiration_date' => 'datetime', 'expiration_date' => 'datetime',
'termination_date' => 'datetime', 'termination_date' => 'datetime',
'seats' => 'integer',
'category_id' => 'integer', 'category_id' => 'integer',
'company_id' => 'integer', 'company_id' => 'integer',
]; ];

12
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v6.0.14', 'app_version' => 'v6.0.14',
'full_app_version' => 'v6.0.14 - build 9236-g05a3f20d5', 'full_app_version' => 'v6.0.14 - build 9599-g1415c8c6e',
'build_version' => '9236', 'build_version' => '9599',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => 'g05a3f20d5', 'hash_version' => 'g1415c8c6e',
'full_hash' => 'v6.0.14-192-g05a3f20d5', 'full_hash' => 'v6.0.14-555-g1415c8c6e',
'branch' => 'master', 'branch' => 'develop',
); );