ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small fixes (#2350)

Browse Source 
* components.view should point to view, not create

* Fix comment

* Rename variable to accurately reflect its responsibility

* Fix line breaks in serial key, remove places where adding line breaks makes no sense.  Fixes #2344
This commit is contained in:
Daniel Meltzer
2016-07-28 22:59:42 -05:00
committed by snipe
parent 8a9307f357
commit eef8d1609e
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AssetsController.php
+4 -4
View File
@@ -626,12 +626,12 @@ class AssetsController extends Controller
if ($asset->save()) {
if ($request->input('checkin_at') == Carbon::now()->format('Y-m-d')) {
$checkout_at = Carbon::now();
$checkin_at = Carbon::now();
} else {
$checkout_at = $request->input('checkin_at').' 00:00:00';
$checkin_at = $request->input('checkin_at').' 00:00:00';
}
//$checkout_at = e(Input::get('checkin_at'));
$logaction = $asset->createLogRecord('checkin', $asset, $admin, $user, null, e(Input::get('note')), $checkout_at);
//$checkin_at = e(Input::get('checkin_at'));
$logaction = $asset->createLogRecord('checkin', $asset, $admin, $user, null, e(Input::get('note')), $checkin_at);
$settings = Setting::getSettings();