diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 2f019e7c1a..2b32c4d6f8 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -282,8 +282,7 @@ if ((row.available_actions) && (row.available_actions.restore === true)) { actions += '
'; actions += '@csrf'; - actions += ' '; - actions += '{{ trans('general.restore') }}
 '; + actions += ' '; } actions +=''; @@ -780,4 +779,4 @@ -@endpush +@endpush \ No newline at end of file diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 5f2af9b835..616ab70890 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -141,11 +141,6 @@
{{ trans('admin/users/message.user_deleted_warning') }} - @can('update', $user) - - {{ trans('admin/users/general.restore_user') }} - - @endcan
@endif @@ -229,7 +224,10 @@ @else
- {{ trans('button.restore') }} +
+ @csrf + +
@endif @endcan @@ -1037,4 +1035,4 @@ $(function () { -@stop +@stop \ No newline at end of file diff --git a/routes/web/hardware.php b/routes/web/hardware.php index 22c4f0f20c..2ef3978946 100644 --- a/routes/web/hardware.php +++ b/routes/web/hardware.php @@ -134,7 +134,7 @@ Route::group( [AssetsController::class, 'getBarCode'] )->name('barcode/hardware'); - Route::get('{assetId}/restore', + Route::post('{assetId}/restore', [AssetsController::class, 'getRestore'] )->name('restore/hardware'); @@ -181,4 +181,4 @@ Route::resource('hardware', 'middleware' => ['auth'], 'parameters' => ['asset' => 'asset_id' ], -]); +]); \ No newline at end of file diff --git a/routes/web/users.php b/routes/web/users.php index b34fae0c17..320ed25343 100644 --- a/routes/web/users.php +++ b/routes/web/users.php @@ -4,47 +4,7 @@ use App\Http\Controllers\Users; use App\Http\Controllers\Users\UserFilesController; use Illuminate\Support\Facades\Route; - // User Management - Route::post( - '{userId}/clone', - [ - Users\UsersController::class, - 'postCreate' - ] - ); - - Route::post( - '{userId}/restore', - [ - Users\UsersController::class, - 'getRestore' - ] - )->name('restore/user'); - - Route::get( - '{userId}/unsuspend', - [ - Users\UsersController::class, - 'getUnsuspend' - ] - )->name('unsuspend/user'); - - Route::post( - '{userId}/upload', - [ - Users\UserFilesController::class, - 'store' - ] - )->name('upload/user'); - - Route::delete( - '{userId}/deletefile/{fileId}', - [ - Users\UserFilesController::class, - 'destroy' - ] - )->name('userfile.destroy'); - +// User Management Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () { @@ -88,7 +48,7 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () { ] )->name('clone/user'); - Route::get( + Route::post( '{userId}/restore', [ Users\UsersController::class, @@ -183,4 +143,4 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () { Route::resource('users', Users\UsersController::class, [ 'middleware' => ['auth'], 'parameters' => ['user' => 'user_id'], -]); +]); \ No newline at end of file