lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixes dumb timestamp if the user manually removes date

Browse source
This commit is contained in:
snipe 2016-04-23 02:34:29 -07:00
parent 895fbb76bf
commit 93e7715c28
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -446,8 +446,8 @@ class AssetsController extends Controller
$user = User::find(e(Input::get('assigned_to'))); $user = User::find(e(Input::get('assigned_to')));
$admin = Auth::user(); $admin = Auth::user();
if (Input::get('checkout_at')!= date("Y-m-d")) { if ((Input::has('checkout_at')) && (Input::get('checkout_at')!= date("Y-m-d"))) {
$checkout_at = e(Input::get('checkout_at')).' 00:00:00'; $checkout_at = e(Input::get('checkout_at'));
} else { } else {
$checkout_at = date("Y-m-d H:i:s"); $checkout_at = date("Y-m-d H:i:s");
} }
@ -1398,7 +1398,7 @@ class AssetsController extends Controller
} else { } else {
$inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm" title="Checkout this asset to a user" data-toggle="tooltip">'.trans('general.checkout').'</a>'; $inout = '<a href="'.route('checkout/hardware', $asset->id).'" class="btn btn-info btn-sm" title="Checkout this asset to a user" data-toggle="tooltip">'.trans('general.checkout').'</a>';
} }
} }
} }
$row = array( $row = array(