BUGFIX 🐛 Make boolean component more robust (when disabled state used)

ndeblauw · Feb 5, 2025 · 2f964e2 · 2f964e2
1 parent bc28262
commit 2f964e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/resources/views/components/formelements/boolean.blade.php b/resources/views/components/formelements/boolean.blade.php
@@ -3,7 +3,7 @@
         @include('BlueAdminFormelements::_label')
         <div class="mt-1 sm:mt-0 sm:col-span-5">
             <label>
-                <input type="hidden" name="{{$name}}" value="0">
+                <input type="hidden" name="{{$name}}" value="{{ $disabled ? ($value ? 1 : 0) : 0 }}">
                 <input {{ ($disabled) ? 'disabled' : '' }}
                         type="checkbox" id="{{$id}}" name="{{$name}}" value="1"
                        class="focus:ring-indigo-500 h-4 w-4 text-blue-600 border-gray-300 rounded {{ ($disabled) ? '!text-blue-200' : '' }}"

diff --git a/src/View/Layouts/FluxAdmin/Header.php b/src/View/Layouts/FluxAdmin/Header.php
@@ -36,7 +36,7 @@ public function findActiveTopLevelMenuItem()
         $fake_index_routename = str($routename)->replace(['show', 'create', 'edit'], 'index')->toString();
         $current_route = Route::has($fake_index_routename)
             ? str(route($fake_index_routename))->replace(config('app.url').'/','')->toString()
-            : Route::current()->uri;
+            : Route::current()?->uri;
 
         // Check if it was one of the top level routes
         $top_routes = collect(config('blue-admin.fluxmenu.top'))->map( fn($item) => $item['link'])->filter(fn($item) => $current_route == $item);