DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 15:57:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

custom field set order starts at 1 now

Browse source
This commit is contained in:
Godfrey M 2023-07-25 11:40:00 -07:00
parent a01cb26aac
commit 11e3487263
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/CustomFieldsetsController.php
View file

@ -51,13 +51,12 @@ class CustomFieldsetsController extends Controller
$maxid = 0; $maxid = 0;
foreach ($cfset->fields as $field) { foreach ($cfset->fields as $field) {
if ($field->pivot->order > $maxid) { if ($field->pivot->order > $maxid) {
$maxid = $field->pivot->order; $maxid = ($field->pivot->order);
} }
if (isset($custom_fields_list[$field->id])) { if (isset($custom_fields_list[$field->id])) {
unset($custom_fields_list[$field->id]); unset($custom_fields_list[$field->id]);
} }
} }
return view('custom_fields.fieldsets.view')->with('custom_fieldset', $cfset)->with('maxid', $maxid + 1)->with('custom_fields_list', $custom_fields_list); return view('custom_fields.fieldsets.view')->with('custom_fieldset', $cfset)->with('maxid', $maxid + 1)->with('custom_fields_list', $custom_fields_list);
} }

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

@ -51,7 +51,7 @@
</span> </span>
</td> </td>
@endcan @endcan
<td class="index">{{$field->pivot->order}}</td> <td class="index">{{$field->pivot->order + 1}}</td>
<td>{{$field->name}}</td> <td>{{$field->name}}</td>
<td>{{$field->format}}</td> <td>{{$field->format}}</td>
<td>{{$field->element}}</td> <td>{{$field->element}}</td>

2
resources/views/settings/ldap.blade.php
View file

@ -20,7 +20,7 @@
} }
</style> </style>
@if ((!function_exists('ldap_connect')) || (!function_exists('ldap_set_option')) || (!function_exists('ldap_bind'))) git checkout -b bug/sc-19126if ((!function_exists('ldap_connect')) || (!function_exists('ldap_set_option')) || (!function_exists('ldap_bind')))
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-12"> <div class="col-md-12">