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

Fixed merge issue in view.blade.php and added translatable string

Browse source
This commit is contained in:
Wächtler, Yannick 2021-11-16 19:34:20 +01:00
parent f2c3e51a83
commit 5a2f8788a9
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/en/button.php
View file

@ -20,4 +20,5 @@ return [
'bulk_actions' => 'Bulk Actions', 'bulk_actions' => 'Bulk Actions',
'add_maintenance' => 'Add Maintenance', 'add_maintenance' => 'Add Maintenance',
'append' => 'Append', 'append' => 'Append',
'remove' => 'Remove',
]; ];

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

@ -57,6 +57,7 @@
<td>{{$field->element}}</td> <td>{{$field->element}}</td>
<td>{{ $field->field_encrypted=='1' ? trans('general.yes') : trans('general.no') }}</td> <td>{{ $field->field_encrypted=='1' ? trans('general.yes') : trans('general.no') }}</td>
<td> <td>
@if ($field->pivot->required) @if ($field->pivot->required)
<form method="post" action="{{ route('fields.optional', [$custom_fieldset->id, $field->id]) }}"> <form method="post" action="{{ route('fields.optional', [$custom_fieldset->id, $field->id]) }}">
@csrf @csrf
@ -70,11 +71,13 @@
<button type="submit" class="btn btn-link"><i class="fa fa-times text-danger" aria-hidden="true"></i></button> <button type="submit" class="btn btn-link"><i class="fa fa-times text-danger" aria-hidden="true"></i></button>
</form> </form>
@endif @endif
</td> </td>
<td> <td>
@can('update', $custom_fieldset) @can('update', $custom_fieldset)
<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]) }}">
@endcan @csrf
<button type="submit" class="btn btn-sm btn-danger">{{ trans('button.remove') }}</button> @endcan
</td> </td>
</tr> </tr>
@endforeach @endforeach