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

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2016-08-02 10:34:43 -07:00
parent 1b7f28598d 682c75e990
commit 1c09479d5f
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -265,13 +265,8 @@ class AssetsController extends Controller
if ($asset->save()) { if ($asset->save()) {
if (Input::get('assigned_to')!='') { if (Input::get('assigned_to')!='') {
$logaction = new Actionlog(); $user = User::find(e(Input::get('assigned_to')));
$logaction->asset_id = $asset->id; $asset->checkOutToUser($user, Auth::user(), date('Y-m-d h:i:s'), '', 'Checked out on asset creation', e(Input::get('name')));
$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');
} }
// Redirect to the asset listing page // Redirect to the asset listing page
\Session::flash('success', trans('admin/hardware/message.create.success')); \Session::flash('success', trans('admin/hardware/message.create.success'));

4
config/version.php
View file

@ -1,5 +1,5 @@
<?php <?php
return array ( return array (
'app_version' => 'v3.1.0', 'app_version' => 'v3.1',
'hash_version' => 'v3.1.0-29-gd6ba0b6', 'hash_version' => 'v3.1-110-g1612562',
); );