lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

fixed view from sending all custom fields

Browse source
This commit is contained in:
Godfrey M 2024-04-22 18:27:34 -07:00
parent df5cacf8a2
commit 96b3af7cbc
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/SettingsController.php
View file

@ -790,10 +790,9 @@ class SettingsController extends Controller
*/ */
public function getLabels() public function getLabels()
{ {
return view('settings.labels', [ return view('settings.labels')
'setting' => Setting::getSettings(), ->with('setting', Setting::getSettings())
'customFields' => CustomField::all(), ->with('customFields', CustomField::where('field_encrypted', '=', 0)->get());
]);
} }
/** /**

1
resources/views/partials/label2-field-definitions.blade.php
View file

@ -348,6 +348,7 @@
</optgroup> </optgroup>
<optgroup label="Custom Fields"> <optgroup label="Custom Fields">
@foreach($customFields as $customField) @foreach($customFields as $customField)
<option value="{{ $customField->db_column }}">{{ $customField->name }}</option> <option value="{{ $customField->db_column }}">{{ $customField->name }}</option>
@endforeach @endforeach
</optgroup> </optgroup>