DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 06:17:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Small refactoring for code quality

Browse source
This commit is contained in:
snipe 2017-10-27 17:38:11 -07:00
parent a224904ade
commit ec68bd7842
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/AccessoriesController.php
View file

@ -100,8 +100,6 @@ class AccessoriesController extends Controller
{ {
$this->authorize('view', Accessory::class); $this->authorize('view', Accessory::class);
$accessory = Accessory::findOrFail($id); $accessory = Accessory::findOrFail($id);
$accessory_users = $accessory->users;
return (new AccessoriesTransformer)->transformAccessory($accessory); return (new AccessoriesTransformer)->transformAccessory($accessory);
} }

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

@ -614,7 +614,7 @@ class AssetsController extends Controller
->with('use_currency', $use_currency)->with('audit_log', $audit_log); ->with('use_currency', $use_currency)->with('audit_log', $audit_log);
} }
return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist', compact('id'))); return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
} }
/** /**
@ -912,22 +912,19 @@ class AssetsController extends Controller
$destinationPath = config('app.private_uploads').'/assets'; $destinationPath = config('app.private_uploads').'/assets';
if (Input::hasFile('assetfile')) { if ($request->file('image')) {
foreach (Input::file('assetfile') as $file) { foreach (Input::file('assetfile') as $file) {
$extension = $file->getClientOriginalExtension(); $extension = $file->getClientOriginalExtension();
$filename = 'hardware-'.$asset->id.'-'.str_random(8); $filename = 'hardware-'.$asset->id.'-'.str_random(8);
$filename .= '-'.str_slug($file->getClientOriginalName()).'.'.$extension; $filename .= '-'.str_slug($file->getClientOriginalName()).'.'.$extension;
$upload_success = $file->move($destinationPath, $filename); $file->move($destinationPath, $filename);
//Log the deletion of seats to the log
$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'));
} else { } else {
return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles')); return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
} }
if ($upload_success) {
return redirect()->back()->with('success', trans('admin/hardware/message.upload.success'));
}
return redirect()->back()->with('error', trans('admin/hardware/message.upload.error')); return redirect()->back()->with('error', trans('admin/hardware/message.upload.error'));
} }
@ -958,11 +955,9 @@ class AssetsController extends Controller
$log->delete(); $log->delete();
return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success')); return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
} }
// Prepare the error message
$error = trans('admin/hardware/message.does_not_exist', compact('id'));
// Redirect to the hardware management page // Redirect to the hardware management page
return redirect()->route('hardware.index')->with('error', $error); return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
} }
/** /**
@ -1010,8 +1005,6 @@ class AssetsController extends Controller
{ {
$this->authorize('update', Asset::class); $this->authorize('update', Asset::class);
if (!$request->has('ids')) { if (!$request->has('ids')) {
return redirect()->back()->with('error', 'No assets selected'); return redirect()->back()->with('error', 'No assets selected');
} }
@ -1224,7 +1217,7 @@ class AssetsController extends Controller
public function audit(Request $request, $id) public function audit($id)
{ {
$this->authorize('audit', Asset::class); $this->authorize('audit', Asset::class);
$dt = Carbon::now()->addMonths(12)->toDateString(); $dt = Carbon::now()->addMonths(12)->toDateString();