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

Codestyle & bug fixes

Browse Source
This commit is contained in:
Dmitrii Minaev
2019-02-28 01:37:58 +03:00
parent d3c320e56f
commit 16bb784e78
10 changed files with 129 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/PredefinedKitsController.php
+16 -16
View File
@@ -186,13 +186,13 @@ class PredefinedKitsController extends Controller
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param int $kit_id
* @return \Illuminate\Http\Response
*/
public function updateLicense(Request $request, $kit_id, $license_id)
{
$this->authorize('update', PredefinedKit::class);
$kit = PredefinedKit::findOrFail($id);
$kit = PredefinedKit::findOrFail($kit_id);
$quantity = $request->input('quantity', 1);
if( $quantity < 1) {
$quantity = 1;
@@ -211,7 +211,7 @@ class PredefinedKitsController extends Controller
public function detachLicense($kit_id, $license_id)
{
$this->authorize('update', PredefinedKit::class);
$kit = PredefinedKit::findOrFail($id);
$kit = PredefinedKit::findOrFail($kit_id);
$kit->licenses()->detach($license_id);
return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Delete was successfull')); // TODO: trans
@@ -220,7 +220,7 @@ class PredefinedKitsController extends Controller
/**
* Display the specified resource.
*
* @param int $id
* @param int $kit_id
* @return \Illuminate\Http\Response
*/
public function indexModels($kit_id) {
@@ -263,13 +263,13 @@ class PredefinedKitsController extends Controller
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param int $kit_id
* @return \Illuminate\Http\Response
*/
public function updateModel(Request $request, $kit_id, $model_id)
{
$this->authorize('update', PredefinedKit::class);
$kit = PredefinedKit::findOrFail($id);
$kit = PredefinedKit::findOrFail($kit_id);
$quantity = $request->input('quantity', 1);
if( $quantity < 1) {
$quantity = 1;
@@ -288,7 +288,7 @@ class PredefinedKitsController extends Controller
public function detachModel($kit_id, $model_id)
{
$this->authorize('update', PredefinedKit::class);
$kit = PredefinedKit::findOrFail($id);
$kit = PredefinedKit::findOrFail($kit_id);
$kit->models()->detach($model_id);
return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Delete was successfull')); // TODO: trans
@@ -299,7 +299,7 @@ class PredefinedKitsController extends Controller
/**
* Display the specified resource.
*
* @param int $id
* @param int $kit_id
* @return \Illuminate\Http\Response
*/
public function indexConsumables($kit_id) {
@@ -340,13 +340,13 @@ class PredefinedKitsController extends Controller
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param int $kit_id
* @return \Illuminate\Http\Response
*/
public function updateConsumable(Request $request, $kit_id, $consumable_id)
{
$this->authorize('update', PredefinedKit::class);
$kit = PredefinedKit::findOrFail($id);
$kit = PredefinedKit::findOrFail($kit_id);
$quantity = $request->input('quantity', 1);
if( $quantity < 1) {
$quantity = 1;
@@ -365,7 +365,7 @@ class PredefinedKitsController extends Controller
public function detachConsumable($kit_id, $consumable_id)
{
$this->authorize('update', PredefinedKit::class);
$kit = PredefinedKit::findOrFail($id);
$kit = PredefinedKit::findOrFail($kit_id);
$kit->consumables()->detach($consumable_id);
return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Delete was successfull')); // TODO: trans
@@ -375,7 +375,7 @@ class PredefinedKitsController extends Controller
/**
* Display the specified resource.
*
* @param int $id
* @param int $kit_id
* @return \Illuminate\Http\Response
*/
public function indexAccessories($kit_id) {
@@ -389,7 +389,7 @@ class PredefinedKitsController extends Controller
/**
* Store the specified resource.
*
* @param int $id
* @param int $kit_id
* @return \Illuminate\Http\Response
*/
public function storeAccessory(Request $request, $kit_id)
@@ -416,13 +416,13 @@ class PredefinedKitsController extends Controller
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @param int $kit_id
* @return \Illuminate\Http\Response
*/
public function updateAccessory(Request $request, $kit_id, $accessory_id)
{
$this->authorize('update', PredefinedKit::class);
$kit = PredefinedKit::findOrFail($id);
$kit = PredefinedKit::findOrFail($kit_id);
$quantity = $request->input('quantity', 1);
if( $quantity < 1) {
$quantity = 1;
@@ -441,7 +441,7 @@ class PredefinedKitsController extends Controller
public function detachAccessory($kit_id, $accessory_id)
{
$this->authorize('update', PredefinedKit::class);
$kit = PredefinedKit::findOrFail($id);
$kit = PredefinedKit::findOrFail($kit_id);
$kit->accessories()->detach($accessory_id);
return response()->json(Helper::formatStandardApiResponse('success', $kit, 'Delete was successfull')); // TODO: trans
app/Http/Controllers/Kits/PredefinedKitsController.php
+3 -3
View File
@@ -76,7 +76,7 @@ class PredefinedKitsController extends Controller
* @param int $kit_id
* @return View
*/
public function edit($kit_id = null)
public function edit($kit_id=null)
{
$this->authorize('update', PredefinedKit::class);
if ($kit = PredefinedKit::find($kit_id)) {
@@ -98,7 +98,7 @@ class PredefinedKitsController extends Controller
* @param int $kit_id
* @return Redirect
*/
public function update(ImageUploadRequest $request, $kit_id = null)
public function update(ImageUploadRequest $request, $kit_id=null)
{
$this->authorize('update', PredefinedKit::class);
// Check if the kit exists
@@ -152,7 +152,7 @@ class PredefinedKitsController extends Controller
* @param int $modelId
* @return View
*/
public function show($kit_id = null)
public function show($kit_id=null)
{
return $this->edit($kit_id);
}