diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php index 3f723559f0..83a2168311 100755 --- a/app/Http/Controllers/ViewAssetsController.php +++ b/app/Http/Controllers/ViewAssetsController.php @@ -165,7 +165,7 @@ class ViewAssetsController extends Controller public function destroy(Asset $asset): RedirectResponse { CancelCheckoutRequest::run($asset, auth()->user()); - return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success')); + return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.canceled')); } diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index f24552d753..5a1b8f5c22 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -480,7 +480,7 @@ if (value.assigned_to_self == true){ return ''; } else if (value.available_actions.cancel == true) { - return '
'; + return ''; } else if (value.available_actions.request == true) { return ''; } diff --git a/routes/web.php b/routes/web.php index 728c9c51e0..6e32ac0135 100644 --- a/routes/web.php +++ b/routes/web.php @@ -294,7 +294,7 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () { Route::get('api', [ProfileController::class, 'api'])->name('user.api'); // View Assets - Route::get('view-assets', [ViewAssetsController::class, 'index'])->name('view-assets'); + Route::get('view-assets', [ViewAssetsController::class, 'getIndex'])->name('view-assets'); Route::get('requested', [ViewAssetsController::class, 'getRequestedAssets'])->name('account.requested');