Fix legacy settings in Twill 3

area17 · Feb 2, 2024 · 23b6d63 · 23b6d63
1 parent 1f443d8
commit 23b6d63
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/Http/Controllers/Admin/SettingController.php b/src/Http/Controllers/Admin/SettingController.php
@@ -61,18 +61,26 @@ public function __construct(
      */
     public function index(string $section)
     {
-        return $this->viewFactory->exists('twill.settings.' . $section)
-        ? $this->viewFactory->make('twill.settings.' . $section, [
+        if (! $this->viewFactory->exists('twill.settings.' . $section)) {
+            return $this->redirector->back();
+        }
+
+        $formFields = $this->settings->getFormFieldsForSection($section);
+
+        View::share('form', [
+            'form_fields' => $formFields,
+        ]);
+
+        return $this->viewFactory->make('twill.settings.' . $section, [
             'customForm' => true,
             'editableTitle' => false,
             'customTitle' => ucfirst($section) . ' settings',
             'section' => $section,
-            'form_fields' => $this->settings->getFormFieldsForSection($section),
+            'form_fields' => $formFields,
             'formBuilder' => Form::make(),
             'saveUrl' => $this->urlGenerator->route(config('twill.admin_route_name_prefix') . 'settings.update', $section),
             'translate' => true,
-        ])
-        : $this->redirector->back();
+        ]);
     }
 
     /**