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

Merge pull request #11595 from snipe/fixes/fix_routes_for_optimize

Browse source 
Fixed routes for optimize
This commit is contained in:
snipe 2022-08-01 17:55:34 -07:00 • committed by GitHub
commit 904b5c2886
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Accessories/AccessoryCheckoutController.php
View file

@ -63,7 +63,7 @@ class AccessoryCheckoutController extends Controller
$this->authorize('checkout', $accessory); $this->authorize('checkout', $accessory);
if (! $user = User::find($request->input('assigned_to'))) { if (! $user = User::find($request->input('assigned_to'))) {
return redirect()->route('checkout/accessory', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist')); return redirect()->route('accessories.checkout.show', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist'));
} }
// Update the accessory data // Update the accessory data

6
app/Http/Controllers/Assets/BulkAssetsController.php
View file

@ -250,7 +250,7 @@ class BulkAssetsController extends Controller
$target = $this->determineCheckoutTarget(); $target = $this->determineCheckoutTarget();
if (! is_array($request->get('selected_assets'))) { if (! is_array($request->get('selected_assets'))) {
return redirect()->route('hardware/bulkcheckout')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected')); return redirect()->route('hardware.bulkcheckout.show')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));
} }
$asset_ids = array_filter($request->get('selected_assets')); $asset_ids = array_filter($request->get('selected_assets'));
@ -297,9 +297,9 @@ class BulkAssetsController extends Controller
return redirect()->to('hardware')->with('success', trans('admin/hardware/message.checkout.success')); return redirect()->to('hardware')->with('success', trans('admin/hardware/message.checkout.success'));
} }
// Redirect to the asset management page with error // Redirect to the asset management page with error
return redirect()->to('hardware/bulk-checkout')->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors); return redirect()->route('hardware.bulkcheckout.show')->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
} catch (ModelNotFoundException $e) { } catch (ModelNotFoundException $e) {
return redirect()->to('hardware/bulk-checkout')->with('error', $e->getErrors()); return redirect()->route('hardware.bulkcheckout.show')->with('error', $e->getErrors());
} }
} }
} }

2
app/Http/Controllers/Auth/SamlController.php
View file

@ -142,6 +142,6 @@ class SamlController extends Controller
return view('errors.403'); return view('errors.403');
} }
return redirect()->route('logout')->with(['saml_logout' => true,'saml_slo_redirect_url' => $sloUrl]); return redirect()->route('logout.get')->with(['saml_logout' => true,'saml_slo_redirect_url' => $sloUrl]);
} }
} }

2
app/Http/Controllers/Consumables/ConsumableCheckoutController.php
View file

@ -56,7 +56,7 @@ class ConsumableCheckoutController extends Controller
// Check if the user exists // Check if the user exists
if (is_null($user = User::find($assigned_to))) { if (is_null($user = User::find($assigned_to))) {
// Redirect to the consumable management page with error // Redirect to the consumable management page with error
return redirect()->route('checkout/consumable', $consumable)->with('error', trans('admin/consumables/message.checkout.user_does_not_exist')); return redirect()->route('consumables.checkout.show', $consumable)->with('error', trans('admin/consumables/message.checkout.user_does_not_exist'));
} }
// Update the consumable data // Update the consumable data

6
resources/views/accessories/view.blade.php
View file

@ -24,13 +24,13 @@
@if ($accessory->assigned_to != '') @if ($accessory->assigned_to != '')
@can('checkin', \App\Models\Accessory::class) @can('checkin', \App\Models\Accessory::class)
<li role="menuitem"> <li role="menuitem">
<a href="{{ route('checkin/accessory', $accessory->id) }}">{{ trans('admin/accessories/general.checkin') }}</a> <a href="{{ route('accessories.checkin.show', $accessory->id) }}">{{ trans('admin/accessories/general.checkin') }}</a>
</li> </li>
@endcan @endcan
@else @else
@can('checkout', \App\Models\Accessory::class) @can('checkout', \App\Models\Accessory::class)
<li role="menuitem"> <li role="menuitem">
<a href="{{ route('checkout/accessory', $accessory->id) }}">{{ trans('admin/accessories/general.checkout') }}</a> <a href="{{ route('accessories.checkout.show', $accessory->id) }}">{{ trans('admin/accessories/general.checkout') }}</a>
</li> </li>
@endcan @endcan
@endif @endif
@ -171,7 +171,7 @@
@can('checkout', \App\Models\Accessory::class) @can('checkout', \App\Models\Accessory::class)
<div class="row"> <div class="row">
<div class="col-md-12 text-center"> <div class="col-md-12 text-center">
<a href="{{ route('checkout/accessory', $accessory->id) }}" style="margin-right:5px;" class="btn btn-primary btn-sm" {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a> <a href="{{ route('accessories.checkout.show', $accessory->id) }}" style="margin-right:5px;" class="btn btn-primary btn-sm" {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a>
</div> </div>
</div> </div>
@endcan @endcan

4
resources/views/auth/two_factor.blade.php
View file

@ -42,13 +42,13 @@
<button class="btn btn-lg btn-primary btn-block">{{ trans('general.submit') }}</button> <button class="btn btn-lg btn-primary btn-block">{{ trans('general.submit') }}</button>
</div> </div>
<div class="col-md-12 col-sm-12 col-xs-12 text-right" style="padding-top: 10px;"> <div class="col-md-12 col-sm-12 col-xs-12 text-right" style="padding-top: 10px;">
<a href="{{ route('logout') }}" onclick="document.getElementById('logout-form').submit(); return false;"> <a href="{{ route('logout.get') }}" onclick="document.getElementById('logout-form').submit(); return false;">
{{ trans('general.cancel') }} {{ trans('general.cancel') }}
</a> </a>
</div> </div>
</div> </div>
</form> </form>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;"> <form id="logout-form" action="{{ route('logout.post') }}" method="POST" style="display: none;">
{{ csrf_field() }} {{ csrf_field() }}
</form> </form>

2
resources/views/components/checkin.blade.php
View file

@ -17,7 +17,7 @@
<div class="row"> <div class="row">
<!-- left column --> <!-- left column -->
<div class="col-md-7"> <div class="col-md-7">
<form class="form-horizontal" method="post" action="{{ route('component.checkin.save', $component_assets->id) }}" autocomplete="off"> <form class="form-horizontal" method="post" action="{{ route('components.checkin.store', $component_assets->id) }}" autocomplete="off">
{{csrf_field()}} {{csrf_field()}}
<div class="box box-default"> <div class="box box-default">

4
resources/views/components/view.blade.php
View file

@ -21,7 +21,7 @@
@if ($component->assigned_to != '') @if ($component->assigned_to != '')
@can('checkin', $component) @can('checkin', $component)
<li role="menuitem"> <li role="menuitem">
<a href="{{ route('checkin/component', $component->id) }}"> <a href="{{ route('components.checkin.show', $component->id) }}">
{{ trans('admin/components/general.checkin') }} {{ trans('admin/components/general.checkin') }}
</a> </a>
</li> </li>
@ -29,7 +29,7 @@
@else @else
@can('checkout', $component) @can('checkout', $component)
<li role="menuitem"> <li role="menuitem">
<a href="{{ route('checkout/component', $component->id) }}"> <a href="{{ route('components.checkout.show', $component->id) }}">
{{ trans('admin/components/general.checkout') }} {{ trans('admin/components/general.checkout') }}
</a> </a>
</li> </li>

2
resources/views/consumables/view.blade.php
View file

@ -127,7 +127,7 @@
@can('checkout', \App\Models\Consumable::class) @can('checkout', \App\Models\Consumable::class)
<div class="col-md-12"> <div class="col-md-12">
<a href="{{ route('checkout/consumable', $consumable->id) }}" style="padding-bottom:5px;" class="btn btn-primary btn-sm" {{ (($consumable->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a> <a href="{{ route('consumables.checkout.show', $consumable->id) }}" style="padding-bottom:5px;" class="btn btn-primary btn-sm" {{ (($consumable->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a>
</div> </div>
@endcan @endcan

4
resources/views/hardware/checkin.blade.php
View file

@ -28,11 +28,11 @@
<div class="col-md-12"> <div class="col-md-12">
@if ($backto=='user') @if ($backto=='user')
<form class="form-horizontal" method="post" <form class="form-horizontal" method="post"
action="{{ route('checkin/hardware', array('assetId'=> $asset->id, 'backto'=>'user')) }}" action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id, 'backto'=>'user')) }}"
autocomplete="off"> autocomplete="off">
@else @else
<form class="form-horizontal" method="post" <form class="form-horizontal" method="post"
action="{{ route('checkin/hardware', $asset->id) }}" autocomplete="off"> action="{{ route('hardware.checkin.store', array('assetId'=> $asset->id)) }}" autocomplete="off">
@endif @endif
{{csrf_field()}} {{csrf_field()}}

4
resources/views/hardware/view.blade.php
View file

@ -22,7 +22,7 @@
@if (($asset->assigned_to != '') && ($asset->deleted_at=='')) @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
@can('checkin', \App\Models\Asset::class) @can('checkin', \App\Models\Asset::class)
<li role="menuitem"> <li role="menuitem">
<a href="{{ route('checkin/hardware', $asset->id) }}"> <a href="{{ route('hardware.checkin.create', $asset->id) }}">
{{ trans('admin/hardware/general.checkin') }} {{ trans('admin/hardware/general.checkin') }}
</a> </a>
</li> </li>
@ -30,7 +30,7 @@
@elseif (($asset->assigned_to == '') && ($asset->deleted_at=='')) @elseif (($asset->assigned_to == '') && ($asset->deleted_at==''))
@can('checkout', \App\Models\Asset::class) @can('checkout', \App\Models\Asset::class)
<li role="menuitem"> <li role="menuitem">
<a href="{{ route('checkout/hardware', $asset->id) }}"> <a href="{{ route('hardware.checkout.create', $asset->id) }}">
{{ trans('admin/hardware/general.checkout') }} {{ trans('admin/hardware/general.checkout') }}
</a> </a>
</li> </li>

6
resources/views/layouts/default.blade.php
View file

@ -354,11 +354,11 @@
<li class="divider"></li> <li class="divider"></li>
<li> <li>
<a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();"> <a href="{{ route('logout.get') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
<i class="fa fa-sign-out fa-fw"></i> {{ trans('general.logout') }} <i class="fa fa-sign-out fa-fw"></i> {{ trans('general.logout') }}
</a> </a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;"> <form id="logout-form" action="{{ route('logout.post') }}" method="POST" style="display: none;">
{{ csrf_field() }} {{ csrf_field() }}
</form> </form>
@ -486,7 +486,7 @@
@can('checkout', \App\Models\Asset::class) @can('checkout', \App\Models\Asset::class)
<li{!! (Request::is('hardware/bulkcheckout') ? ' class="active"' : '') !!}> <li{!! (Request::is('hardware/bulkcheckout') ? ' class="active"' : '') !!}>
<a href="{{ route('hardware/bulkcheckout') }}"> <a href="{{ route('hardware.bulkcheckout.show') }}">
{{ trans('general.bulk_checkout') }} {{ trans('general.bulk_checkout') }}
</a> </a>
</li> </li>

6
resources/views/models/view.blade.php
View file

@ -16,10 +16,10 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
@if ($model->deleted_at=='') @if ($model->deleted_at=='')
<li><a href="{{ route('models.edit', $model->id) }}">{{ trans('admin/models/table.edit') }}</a></li> <li><a href="{{ route('models.edit', $model->id) }}">{{ trans('admin/models/table.edit') }}</a></li>
<li><a href="{{ route('clone/model', $model->id) }}">{{ trans('admin/models/table.clone') }}</a></li> <li><a href="{{ route('models.clone.create', $model->id) }}">{{ trans('admin/models/table.clone') }}</a></li>
<li><a href="{{ route('hardware.create', ['model_id' => $model->id]) }}">{{ trans('admin/hardware/form.create') }}</a></li> <li><a href="{{ route('hardware.create', ['model_id' => $model->id]) }}">{{ trans('admin/hardware/form.create') }}</a></li>
@else @else
<li><a href="{{ route('restore/model', $model->id) }}">{{ trans('admin/models/general.restore') }}</a></li> <li><a href="{{ route('models.restore.store', $model->id) }}">{{ trans('admin/models/general.restore') }}</a></li>
@endif @endif
</ul> </ul>
</div> </div>
@ -316,7 +316,7 @@
@can('create', \App\Models\AssetModel::class) @can('create', \App\Models\AssetModel::class)
<div class="col-md-12" style="padding-bottom: 5px;"> <div class="col-md-12" style="padding-bottom: 5px;">
<a href="{{ route('clone/model', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('admin/models/table.clone') }}</a> <a href="{{ route('models.clone.create', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('admin/models/table.clone') }}</a>
</div> </div>
@endcan @endcan

6
resources/views/users/view.blade.php
View file

@ -113,7 +113,7 @@
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="{{ route('users.edit', $user->id) }}">{{ trans('admin/users/general.edit') }}</a></li> <li><a href="{{ route('users.edit', $user->id) }}">{{ trans('admin/users/general.edit') }}</a></li>
<li><a href="{{ route('clone/user', $user->id) }}">{{ trans('admin/users/general.clone') }}</a></li> <li><a href="{{ route('users.clone.show', $user->id) }}">{{ trans('admin/users/general.clone') }}</a></li>
@if ((Auth::user()->id !== $user->id) && (!config('app.lock_passwords')) && ($user->deleted_at=='')) @if ((Auth::user()->id !== $user->id) && (!config('app.lock_passwords')) && ($user->deleted_at==''))
<li><a href="{{ route('users.destroy', $user->id) }}">{{ trans('button.delete') }}</a></li> <li><a href="{{ route('users.destroy', $user->id) }}">{{ trans('button.delete') }}</a></li>
@endif @endif
@ -173,7 +173,7 @@
@can('create', $user) @can('create', $user)
<div class="col-md-12" style="padding-top: 5px;"> <div class="col-md-12" style="padding-top: 5px;">
<a href="{{ route('clone/user', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/users/general.clone') }}</a> <a href="{{ route('users.clone.show', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/users/general.clone') }}</a>
</div> </div>
@endcan @endcan
@ -228,7 +228,7 @@
</div> </div>
@else @else
<div class="col-md-12" style="padding-top: 5px;"> <div class="col-md-12" style="padding-top: 5px;">
<form method="POST" action="{{ route('restore/user', $user->id) }}"> <form method="POST" action="{{ route('users.restore.store', $user->id) }}">
@csrf @csrf
<button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.restore') }}</button> <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.restore') }}</button>
</form> </form>

4
routes/web.php
View file

@ -467,12 +467,12 @@ Route::group(['middleware' => 'web'], function () {
Route::get( Route::get(
'logout', 'logout',
[LoginController::class, 'logout'] [LoginController::class, 'logout']
)->name('logout'); )->name('logout.get');
Route::post( Route::post(
'logout', 'logout',
[LoginController::class, 'logout'] [LoginController::class, 'logout']
)->name('logout'); )->name('logout.post');
}); });
//Auth::routes(); //Auth::routes();

8
routes/web/accessories.php
View file

@ -10,22 +10,22 @@ Route::group(['prefix' => 'accessories', 'middleware' => ['auth']], function ()
Route::get( Route::get(
'{accessoryID}/checkout', '{accessoryID}/checkout',
[Accessories\AccessoryCheckoutController::class, 'create'] [Accessories\AccessoryCheckoutController::class, 'create']
)->name('checkout/accessory'); )->name('accessories.checkout.show');
Route::post( Route::post(
'{accessoryID}/checkout', '{accessoryID}/checkout',
[Accessories\AccessoryCheckoutController::class, 'store'] [Accessories\AccessoryCheckoutController::class, 'store']
)->name('checkout/accessory'); )->name('accessories.checkout.store');
Route::get( Route::get(
'{accessoryID}/checkin/{backto?}', '{accessoryID}/checkin/{backto?}',
[Accessories\AccessoryCheckinController::class, 'create'] [Accessories\AccessoryCheckinController::class, 'create']
)->name('checkin/accessory'); )->name('accessories.checkin.show');
Route::post( Route::post(
'{accessoryID}/checkin/{backto?}', '{accessoryID}/checkin/{backto?}',
[Accessories\AccessoryCheckinController::class, 'store'] [Accessories\AccessoryCheckinController::class, 'store']
)->name('checkin/accessory'); )->name('accessories.checkin.store');
}); });

8
routes/web/components.php
View file

@ -8,22 +8,22 @@ Route::group(['prefix' => 'components', 'middleware' => ['auth']], function () {
Route::get( Route::get(
'{componentID}/checkout', '{componentID}/checkout',
[Components\ComponentCheckoutController::class, 'create'] [Components\ComponentCheckoutController::class, 'create']
)->name('checkout/component'); )->name('components.checkout.show');
Route::post( Route::post(
'{componentID}/checkout', '{componentID}/checkout',
[Components\ComponentCheckoutController::class, 'store'] [Components\ComponentCheckoutController::class, 'store']
)->name('checkout/component'); )->name('components.checkout.store');
Route::get( Route::get(
'{componentID}/checkin/{backto?}', '{componentID}/checkin/{backto?}',
[Components\ComponentCheckinController::class, 'create'] [Components\ComponentCheckinController::class, 'create']
)->name('checkin/component'); )->name('components.checkin.show');
Route::post( Route::post(
'{componentID}/checkin/{backto?}', '{componentID}/checkin/{backto?}',
[Components\ComponentCheckinController::class, 'store'] [Components\ComponentCheckinController::class, 'store']
)->name('component.checkin.save'); )->name('components.checkin.store');
}); });

4
routes/web/consumables.php
View file

@ -9,12 +9,12 @@ Route::group(['prefix' => 'consumables', 'middleware' => ['auth']], function ()
Route::get( Route::get(
'{consumablesID}/checkout', '{consumablesID}/checkout',
[Consumables\ConsumableCheckoutController::class, 'create'] [Consumables\ConsumableCheckoutController::class, 'create']
)->name('checkout/consumable'); )->name('consumables.checkout.show');
Route::post( Route::post(
'{consumablesID}/checkout', '{consumablesID}/checkout',
[Consumables\ConsumableCheckoutController::class, 'store'] [Consumables\ConsumableCheckoutController::class, 'store']
)->name('checkout/consumable'); )->name('consumables.checkout.store');
}); });

12
routes/web/hardware.php
View file

@ -108,19 +108,19 @@ Route::group(
Route::get('{assetId}/checkout', Route::get('{assetId}/checkout',
[AssetCheckoutController::class, 'create'] [AssetCheckoutController::class, 'create']
)->name('checkout/hardware'); )->name('hardware.checkout.create');
Route::post('{assetId}/checkout', Route::post('{assetId}/checkout',
[AssetCheckoutController::class, 'store'] [AssetCheckoutController::class, 'store']
)->name('checkout/hardware'); )->name('hardware.checkout.store');
Route::get('{assetId}/checkin/{backto?}', Route::get('{assetId}/checkin/{backto?}',
[AssetCheckinController::class, 'create'] [AssetCheckinController::class, 'create']
)->name('checkin/hardware'); )->name('hardware.checkin.create');
Route::post('{assetId}/checkin/{backto?}', Route::post('{assetId}/checkin/{backto?}',
[AssetCheckinController::class, 'store'] [AssetCheckinController::class, 'store']
)->name('checkin/hardware'); )->name('hardware.checkin.store');
Route::get('{assetId}/view', Route::get('{assetId}/view',
[AssetsController::class, 'show'] [AssetsController::class, 'show']
@ -168,11 +168,11 @@ Route::group(
// Bulk checkout / checkin // Bulk checkout / checkin
Route::get('bulkcheckout', Route::get('bulkcheckout',
[BulkAssetsController::class, 'showCheckout'] [BulkAssetsController::class, 'showCheckout']
)->name('hardware/bulkcheckout'); )->name('hardware.bulkcheckout.show');
Route::post('bulkcheckout', Route::post('bulkcheckout',
[BulkAssetsController::class, 'storeCheckout'] [BulkAssetsController::class, 'storeCheckout']
)->name('hardware/bulkcheckout'); )->name('hardware.bulkcheckout.store');
}); });
Route::resource('hardware', Route::resource('hardware',

6
routes/web/models.php
View file

@ -28,7 +28,7 @@ Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
AssetModelsController::class, AssetModelsController::class,
'getClone' 'getClone'
] ]
)->name('clone/model'); )->name('models.clone.create');
Route::post( Route::post(
'{modelId}/clone', '{modelId}/clone',
@ -36,7 +36,7 @@ Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
AssetModelsController::class, AssetModelsController::class,
'postCreate' 'postCreate'
] ]
)->name('clone/model'); )->name('models.clone.store');
Route::get( Route::get(
'{modelId}/view', '{modelId}/view',
@ -52,7 +52,7 @@ Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
AssetModelsController::class, AssetModelsController::class,
'getRestore' 'getRestore'
] ]
)->name('restore/model'); )->name('models.restore.store');
Route::get( Route::get(
'{modelId}/custom_fields', '{modelId}/custom_fields',

6
routes/web/users.php
View file

@ -38,7 +38,7 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
Users\UsersController::class, Users\UsersController::class,
'getClone' 'getClone'
] ]
)->name('clone/user'); )->name('users.clone.show');
Route::post( Route::post(
'{userId}/clone', '{userId}/clone',
@ -46,7 +46,7 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
Users\UsersController::class, Users\UsersController::class,
'postCreate' 'postCreate'
] ]
)->name('clone/user'); )->name('users.clone.store');
Route::post( Route::post(
'{userId}/restore', '{userId}/restore',
@ -54,7 +54,7 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
Users\UsersController::class, Users\UsersController::class,
'getRestore' 'getRestore'
] ]
)->name('restore/user'); )->name('users.restore.store');
Route::get( Route::get(
'{userId}/unsuspend', '{userId}/unsuspend',