Fixes #36626 - safe checks for the pxe_loader

@host.pxe_loader returns empty string if it's not set on the host or the hostgroup. This fix issue in render phase when @host.pxe_loader is nil and include? is called. Create host form now require to select a PXE loader, None or something else. Same as in the API.
theforeman · Aug 1, 2023 · f5336a8 · f5336a8
1 parent 1c3a415
commit f5336a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/host/managed.rb b/app/models/host/managed.rb
@@ -728,7 +728,7 @@ def explicit_pxe_loader
   end
 
   def pxe_loader
-    explicit_pxe_loader || hostgroup.try(:pxe_loader)
+    explicit_pxe_loader || hostgroup.try(:pxe_loader) || ''
   end
 
   def pxe_loader_efi?

diff --git a/app/views/common/os_selection/_pxe_loader.html.erb b/app/views/common/os_selection/_pxe_loader.html.erb
@@ -6,7 +6,7 @@
   %>
     <%= selectable_f f, :pxe_loader,
       loaders.to_a, {
-        :include_blank => pxe_loader_selected,
+        :include_blank => false,
         :selected => pxe_loader_selected == true ? f.object.pxe_loader : pxe_loader_selected
       },
       :label => _('PXE loader'),