From 1612562f416024a3485ee163673b6bf20c2a53bc Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 2 Aug 2016 10:33:44 -0700 Subject: [PATCH 1/2] =?UTF-8?q?Create=20log=20record=20and=20send=20EULA?= =?UTF-8?q?=20when=20creating=20a=20new=20asset=20that=E2=80=99s=20checked?= =?UTF-8?q?=20out?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/AssetsController.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php index 6b216d6de..356f02978 100755 --- a/app/Http/Controllers/AssetsController.php +++ b/app/Http/Controllers/AssetsController.php @@ -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')); From 682c75e990a87867eb015ea0e9c998557f702760 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 2 Aug 2016 10:34:30 -0700 Subject: [PATCH 2/2] Bumped version --- config/version.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/version.php b/config/version.php index daed147db..2eba745d0 100644 --- a/config/version.php +++ b/config/version.php @@ -1,5 +1,5 @@ 'v3.1.0', - 'hash_version' => 'v3.1.0-29-gd6ba0b6', -); \ No newline at end of file + 'app_version' => 'v3.1', + 'hash_version' => 'v3.1-110-g1612562', +);