From e3da9071cb99ef98065270b628beef62bf075f6c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 3 Mar 2021 12:06:28 +0100
Subject: [serversetup-bwlp-ipxe] Fix invisible title in location menu selector

Closes #3839
---
 modules-available/serversetup-bwlp-ipxe/page.inc.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php
index 4fd324da..b5a70c25 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -904,7 +904,9 @@ class Page_ServerSetup extends Page
 		}
 		User::assertPermission('ipxe.menu.assign', $locationId);
 		// List of menu entries
-		$res = Database::simpleQuery('SELECT menuentryid, title FROM serversetup_menuentry');
+		$res = Database::simpleQuery('SELECT me.menuentryid, If(Length(me.title) = 0, be.title, me.title)
+			FROM serversetup_menuentry me
+			INNER JOIN serversetup_bootentry be USING (entryid)');
 		$menuEntries = $res->fetchAll(PDO::FETCH_KEY_PAIR);
 		// List of menus
 		$data = [
@@ -913,10 +915,11 @@ class Page_ServerSetup extends Page
 		];
 		$menu = IPxeMenu::forLocation($loc['parentlocationid']);
 		$data['defaultMenu'] = $menu;
-		$res = Database::simpleQuery('SELECT m.menuid, m.title, ml.locationid, ml.defaultentryid, GROUP_CONCAT(me.menuentryid) AS entries FROM serversetup_menu m
+		$res = Database::simpleQuery('SELECT m.menuid, m.title, ml.locationid, ml.defaultentryid, GROUP_CONCAT(me.menuentryid) AS entries
+				FROM serversetup_menu m
 				LEFT JOIN serversetup_menu_location ml ON (m.menuid = ml.menuid AND ml.locationid = :locationid)
 				INNER JOIN serversetup_menuentry me ON (m.menuid = me.menuid AND me.entryid IS NOT NULL)
-				GROUP BY menuid
+				GROUP BY m.menuid, m.title
 				ORDER BY m.title ASC', ['locationid' => $locationId]);
 		$menus = [];
 		$hasDefault = false;
-- 
cgit v1.2.3-55-g7522