mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-20 07:47:41 -07:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
1c09479d5f
|
@ -265,13 +265,8 @@ class AssetsController extends Controller
|
|||
if ($asset->save()) {
|
||||
|
||||
if (Input::get('assigned_to')!='') {
|
||||
$logaction = new Actionlog();
|
||||
$logaction->asset_id = $asset->id;
|
||||
$logaction->checkedout_to = $asset->assigned_to;
|
||||
$logaction->asset_type = 'hardware';
|
||||
$logaction->user_id = Auth::user()->id;
|
||||
$logaction->note = e(Input::get('note'));
|
||||
$log = $logaction->logaction('checkout');
|
||||
$user = User::find(e(Input::get('assigned_to')));
|
||||
$asset->checkOutToUser($user, Auth::user(), date('Y-m-d h:i:s'), '', 'Checked out on asset creation', e(Input::get('name')));
|
||||
}
|
||||
// Redirect to the asset listing page
|
||||
\Session::flash('success', trans('admin/hardware/message.create.success'));
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?php
|
||||
return array (
|
||||
'app_version' => 'v3.1.0',
|
||||
'hash_version' => 'v3.1.0-29-gd6ba0b6',
|
||||
);
|
||||
'app_version' => 'v3.1',
|
||||
'hash_version' => 'v3.1-110-g1612562',
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue