DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Catching up to snipe-it/develop branch

Browse source
This commit is contained in:
Wächtler, Yannick 2021-11-16 19:25:23 +01:00
parent 74ed790d20
commit f2c3e51a83
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
resources/views/custom_fields/fieldsets/view.blade.php
View file

@ -73,14 +73,7 @@
</td> </td>
<td> <td>
@can('update', $custom_fieldset) @can('update', $custom_fieldset)
<<<<<<< HEAD
<a href="{{ route('fields.disassociate', [$field, $custom_fieldset->id]) }}" class="btn btn-sm btn-danger">{{ trans('button.remove') }}</a> <a href="{{ route('fields.disassociate', [$field, $custom_fieldset->id]) }}" class="btn btn-sm btn-danger">{{ trans('button.remove') }}</a>
=======
<form method="post" action="{{ route('fields.disassociate', [$field, $custom_fieldset->id]) }}">
@csrf
<button type="submit" class="btn btn-sm btn-danger">Remove</button>
</form>
>>>>>>> 476e17055beb3a2f989946812010d9f23851ca89
@endcan @endcan
</td> </td>
</tr> </tr>