DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-11-27 14:46:37 +00:00
parent d80c8ff25b 77ab5eb875
commit c72950166f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@
@can('update', $custom_fieldset) @can('update', $custom_fieldset)
<th class="col-md-1"><span class="sr-only">{{ trans('admin/custom_fields/general.reorder') }}</span></th> <th class="col-md-1"><span class="sr-only">{{ trans('admin/custom_fields/general.reorder') }}</span></th>
@endcan @endcan
<th class="col-md-1">{{ trans('admin/custom_fields/general.order') }}</th> <th class="col-md-1" style="display: none;">{{ trans('admin/custom_fields/general.order') }}</th>
<th class="col-md-3">{{ trans('admin/custom_fields/general.field_name') }}</th> <th class="col-md-3">{{ trans('admin/custom_fields/general.field_name') }}</th>
<th class="col-md-2">{{ trans('admin/custom_fields/general.field_format') }}</th> <th class="col-md-2">{{ trans('admin/custom_fields/general.field_format') }}</th>
<th class="col-md-2">{{ trans('admin/custom_fields/general.field_element') }}</th> <th class="col-md-2">{{ trans('admin/custom_fields/general.field_element') }}</th>
@ -51,7 +51,7 @@
</span> </span>
</td> </td>
@endcan @endcan
<td class="index">{{$field->pivot->order + 1}}</td> <td class="index" style="display: none;">{{$field->pivot->order + 1}}</td> {{--this +1 needs to exist to keep the first row from reverting to 0 if you edit/delete fields in/from a fielset--}}
<td>{{$field->name}}</td> <td>{{$field->name}}</td>
<td>{{$field->format}}</td> <td>{{$field->format}}</td>
<td>{{$field->element}}</td> <td>{{$field->element}}</td>
@ -110,7 +110,7 @@
</label> </label>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2" style="display: none;">
{{ Form::text('order', $maxid, array('class' => 'form-control col-sm-1 col-md-1', 'style'=> 'width: 80px; padding-;right: 10px;', 'aria-label'=>'order', 'maxlength'=>'3', 'size'=>'3')) }} {{ Form::text('order', $maxid, array('class' => 'form-control col-sm-1 col-md-1', 'style'=> 'width: 80px; padding-;right: 10px;', 'aria-label'=>'order', 'maxlength'=>'3', 'size'=>'3')) }}
<label for="order">{{ trans('admin/custom_fields/general.order') }}</label> <label for="order">{{ trans('admin/custom_fields/general.order') }}</label>