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

snipe · Nov 16, 2021 · 5a2f878 · 5a2f878
1 parent f2c3e51
commit 5a2f878
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/resources/lang/en/button.php b/resources/lang/en/button.php
@@ -20,4 +20,5 @@
     'bulk_actions'              => 'Bulk Actions',
     'add_maintenance'           => 'Add Maintenance',
     'append'                    => 'Append',
+    'remove'                    => 'Remove',
 ];
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -57,6 +57,7 @@
               <td>{{$field->element}}</td>
               <td>{{ $field->field_encrypted=='1' ?  trans('general.yes') : trans('general.no') }}</td>
                 <td>
+
                     @if ($field->pivot->required)
                     <form method="post" action="{{ route('fields.optional', [$custom_fieldset->id, $field->id]) }}">
                       @csrf 
@@ -70,11 +71,13 @@
                       <button type="submit" class="btn btn-link"><i class="fa fa-times text-danger" aria-hidden="true"></i></button>
                       </form>
                     @endif
+
                 </td>
               <td>
                 @can('update', $custom_fieldset)
-                <a href="{{ route('fields.disassociate', [$field, $custom_fieldset->id]) }}" class="btn btn-sm btn-danger">{{ trans('button.remove') }}</a>
-                @endcan
+                <form method="post" action="{{ route('fields.disassociate', [$field, $custom_fieldset->id]) }}">
+                  @csrf 
+                  <button type="submit" class="btn btn-sm btn-danger">{{ trans('button.remove') }}</button>                @endcan
               </td>
             </tr>
             @endforeach