DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 09:34:10 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

push for testing

Browse source
This commit is contained in:
akemidx 2023-04-11 13:52:14 -04:00
parent cc88a361ca
commit a65b8025b6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Assets/AssetsController.php
View file

@ -767,7 +767,7 @@ class AssetsController extends Controller
} }
/** /**
* Retore a deleted asset. * Restore a deleted asset.
* *
* @author [A. Gianotto] [<snipe@snipe.net>] * @author [A. Gianotto] [<snipe@snipe.net>]
* @param int $assetId * @param int $assetId

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

@ -873,7 +873,7 @@
<!-- generic image goes here --> <!-- generic image goes here -->
@endif @endif
<!-- Start button column --> <!-- Start side button column -->
@if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1')) @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
@if (($asset->assigned_to != '') && ($asset->deleted_at=='')) @if (($asset->assigned_to != '') && ($asset->deleted_at==''))
@ -923,10 +923,10 @@
@can('delete', $asset) @can('delete', $asset)
@if ($asset->deleted_at=='') @if ($asset->deleted_at=='')
<div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;"> <div class="col-md-12" style="padding-top: 30px; padding-bottom: 30px;">
<form action="{{ route('delete/assetfile', [$asset->id,12]) }}" method="POST"> <form action="{{ route('delete/assetfile', [$asset->id,$fileId->id]) }}" method="POST">
{{csrf_field()}} {{csrf_field()}}
{{ method_field("DELETE")}} {{ method_field("DELETE")}}
<button style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('button.delete')}}</button> <button style="width: 100%;" class="btn btn-sm btn-warning hidden-print" >{{ trans('button.delete')}}</button>
</form> </form>
</div> </div>
@endif @endif