From e934f5d5c1414e0bf5448d7ab96d04094a93d69b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 16 Apr 2019 13:24:05 +0200
Subject: [serversetup-bwlp-ipxe] Show parent menu in location assign dialog

---
 modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php         | 5 +++++
 modules-available/serversetup-bwlp-ipxe/page.inc.php                 | 2 ++
 .../serversetup-bwlp-ipxe/templates/menu-assign-location.html        | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php
index f437c447..a58f4d10 100644
--- a/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php
@@ -71,6 +71,11 @@ class IPxeMenu
 		return $str;
 	}
 
+	public function title()
+	{
+		return $this->title;
+	}
+
 	public function timeoutMs()
 	{
 		return $this->timeoutMs;
diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php
index 810d8e5b..c1f7084d 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -833,6 +833,8 @@ class Page_ServerSetup extends Page
 			'locationid' => $locationId,
 			'locationName' => $loc['locationname'],
 		];
+		$menu = IPxeMenu::forLocation($loc['parentlocationid']);
+		$data['defaultMenu'] = $menu->title();
 		$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)
diff --git a/modules-available/serversetup-bwlp-ipxe/templates/menu-assign-location.html b/modules-available/serversetup-bwlp-ipxe/templates/menu-assign-location.html
index 077d137e..128d28ea 100644
--- a/modules-available/serversetup-bwlp-ipxe/templates/menu-assign-location.html
+++ b/modules-available/serversetup-bwlp-ipxe/templates/menu-assign-location.html
@@ -25,7 +25,7 @@
 			<td>
 				<i>{{lang_useDefaultMenu}}</i>
 			</td>
-			<td></td>
+			<td>{{defaultMenu}}</td>
 		</tr>
 		{{#list}}
 			<tr>
-- 
cgit v1.2.3-55-g7522