DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-13 15:01:02 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-07-02 13:08:59 -07:00
parent 9a0b677dac afab167e8c
commit 1ef20ec622
4 changed files with 12 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/views/partials/bootstrap-table.blade.php
View file

@ -282,8 +282,7 @@
if ((row.available_actions) && (row.available_actions.restore === true)) { if ((row.available_actions) && (row.available_actions.restore === true)) {
actions += '<form style="display: inline;" method="POST" action="{{ url('/') }}/' + dest + '/' + row.id + '/restore"> '; actions += '<form style="display: inline;" method="POST" action="{{ url('/') }}/' + dest + '/' + row.id + '/restore"> ';
actions += '@csrf'; actions += '@csrf';
actions += '<a href="{{ url('/') }}/' + dest + '/' + row.id + '/restore" class="btn btn-sm btn-warning" data-toggle="tooltip" title="{{ trans('general.restore') }}"><i class="far fa-clone"></i></a>&nbsp;'; actions += '<button class="btn btn-sm btn-warning" data-toggle="tooltip" title="{{ trans('general.restore') }}"><i class="far fa-retweet"></i></button>&nbsp;';
actions += '<i class="fa fa-retweet" aria-hidden="true"></i><span class="sr-only">{{ trans('general.restore') }}</span></button></form>&nbsp;';
} }
actions +='</nobr>'; actions +='</nobr>';

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

@ -141,11 +141,6 @@
<div class="callout callout-warning"> <div class="callout callout-warning">
<i class="icon fas fa-exclamation-triangle"></i> <i class="icon fas fa-exclamation-triangle"></i>
{{ trans('admin/users/message.user_deleted_warning') }} {{ trans('admin/users/message.user_deleted_warning') }}
@can('update', $user)
<a href="{{ route('restore/user', $user->id) }}">
{{ trans('admin/users/general.restore_user') }}
</a>
@endcan
</div> </div>
</div> </div>
@endif @endif
@ -229,7 +224,10 @@
</div> </div>
@else @else
<div class="col-md-12" style="padding-top: 5px;"> <div class="col-md-12" style="padding-top: 5px;">
<a href="{{ route('restore/user', $user->id) }}" style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.restore') }}</a> <form method="POST" action="{{ route('restore/user', $user->id) }}">
@csrf
<button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.restore') }}</button>
</form>
</div> </div>
@endif @endif
@endcan @endcan

2
routes/web/hardware.php
View file

@ -134,7 +134,7 @@ Route::group(
[AssetsController::class, 'getBarCode'] [AssetsController::class, 'getBarCode']
)->name('barcode/hardware'); )->name('barcode/hardware');
Route::get('{assetId}/restore', Route::post('{assetId}/restore',
[AssetsController::class, 'getRestore'] [AssetsController::class, 'getRestore']
)->name('restore/hardware'); )->name('restore/hardware');

42
routes/web/users.php
View file

@ -5,46 +5,6 @@ use App\Http\Controllers\Users\UserFilesController;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
// User Management // 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');
Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () { Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
@ -88,7 +48,7 @@ Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
] ]
)->name('clone/user'); )->name('clone/user');
Route::get( Route::post(
'{userId}/restore', '{userId}/restore',
[ [
Users\UsersController::class, Users\UsersController::class,