From 96b3af7cbc312b02316f156c136225f2fbe362af Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 22 Apr 2024 18:27:34 -0700
Subject: [PATCH] fixed view from sending all custom fields

---
 app/Http/Controllers/SettingsController.php                | 7 +++----
 .../views/partials/label2-field-definitions.blade.php      | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index b1cb620a83..ddac876885 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -790,10 +790,9 @@ class SettingsController extends Controller
      */
     public function getLabels()
     {
-        return view('settings.labels', [
-            'setting' => Setting::getSettings(),
-            'customFields' => CustomField::all(),
-        ]);
+        return view('settings.labels')
+            ->with('setting', Setting::getSettings())
+            ->with('customFields', CustomField::where('field_encrypted', '=', 0)->get());
     }
 
     /**
diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php
index 8d8c680c94..26c1fb43ae 100644
--- a/resources/views/partials/label2-field-definitions.blade.php
+++ b/resources/views/partials/label2-field-definitions.blade.php
@@ -348,6 +348,7 @@
                             </optgroup>
                             <optgroup label="Custom Fields">
                                 @foreach($customFields as $customField)
+
                                     <option value="{{ $customField->db_column }}">{{ $customField->name }}</option>
                                 @endforeach
                             </optgroup>