DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 15:57:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Code cleanup

Browse source
This commit is contained in:
snipe 2017-10-27 18:01:42 -07:00
parent b1ac024725
commit f49ecbdb61
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -400,9 +400,8 @@ class AssetsController extends Controller
$logaction->item_id = $asset->id; $logaction->item_id = $asset->id;
$logaction->created_at = date("Y-m-d H:i:s"); $logaction->created_at = date("Y-m-d H:i:s");
$logaction->user_id = Auth::user()->id; $logaction->user_id = Auth::user()->id;
$log = $logaction->logaction('deleted'); $logaction->logaction('deleted');
// Redirect to the asset management page
return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.delete.success')); return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.delete.success'));
} }
@ -908,6 +907,7 @@ class AssetsController extends Controller
if (!$asset = Asset::find($assetId)) { if (!$asset = Asset::find($assetId)) {
return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
} }
$this->authorize('update', $asset); $this->authorize('update', $asset);
$destinationPath = config('app.private_uploads').'/assets'; $destinationPath = config('app.private_uploads').'/assets';
@ -921,11 +921,9 @@ class AssetsController extends Controller
$asset->logUpload($filename, e(Input::get('notes'))); $asset->logUpload($filename, e(Input::get('notes')));
} }
return redirect()->back()->with('success', trans('admin/hardware/message.upload.success')); return redirect()->back()->with('success', trans('admin/hardware/message.upload.success'));
} else {
return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
} }
return redirect()->back()->with('error', trans('admin/hardware/message.upload.error')); return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
} }
/** /**