From a155dacb5513271b8c8551e2938082658f21970e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 28 Feb 2019 11:07:02 +0100
Subject: [serversetup-bwlp-ipxe] Fix boot entry management

---
 modules-available/serversetup-bwlp-ipxe/page.inc.php          | 11 ++++++-----
 .../serversetup-bwlp-ipxe/templates/ipxe-new-boot-entry.html  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'modules-available')

diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php
index 6f95d754..07683df3 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -271,8 +271,8 @@ class Page_ServerSetup extends Page
 	{
 		$allowEdit = User::hasPermission('ipxe.bootentry.edit');
 
-		$res = Database::simpleQuery("SELECT be.entryid, be.hotkey, be.title, be.builtin, Count(*) AS refs FROM serversetup_bootentry be
-				INNER JOIN serversetup_menuentry sm USING (entryid)
+		$res = Database::simpleQuery("SELECT be.entryid, be.hotkey, be.title, be.builtin, Count(sm.menuid) AS refs FROM serversetup_bootentry be
+				LEFT JOIN serversetup_menuentry sm USING (entryid)
 				GROUP BY be.entryid
 				ORDER BY be.title ASC");
 		$bootentryTable = [];
@@ -438,7 +438,7 @@ class Page_ServerSetup extends Page
 			}
 			$entry->addFormFields($params);
 			$params['title'] = $row['title'];
-			$params['entryid'] = $row['entryid'];
+			$params['oldentryid'] = $params['entryid'] = $row['entryid'];
 			$params['builtin'] = $row['builtin'];
 			$params['menus'] = Database::queryAll('SELECT m.menuid, m.title FROM serversetup_menu m
 					INNER JOIN serversetup_menuentry me ON (me.menuid = m.menuid)
@@ -495,15 +495,16 @@ class Page_ServerSetup extends Page
 		return true;
 	}
 
-	private function deleteBootEntry() {
+	private function deleteBootEntry()
+	{
 		$id = Request::post('deleteid', false, 'string');
 		if ($id === false) {
 			Message::addError('main.parameter-missing', 'deleteid');
 			return;
 		}
 		Database::exec("DELETE FROM serversetup_bootentry WHERE entryid = :entryid", array("entryid" => $id));
-		// TODO: Redirect to &show=bootentry
 		Message::addSuccess('bootentry-deleted');
+		Util::redirect('?do=serversetup&show=bootentry');
 	}
 
 	private function setDefaultMenu()
diff --git a/modules-available/serversetup-bwlp-ipxe/templates/ipxe-new-boot-entry.html b/modules-available/serversetup-bwlp-ipxe/templates/ipxe-new-boot-entry.html
index 7e82b5cc..687c312b 100644
--- a/modules-available/serversetup-bwlp-ipxe/templates/ipxe-new-boot-entry.html
+++ b/modules-available/serversetup-bwlp-ipxe/templates/ipxe-new-boot-entry.html
@@ -14,7 +14,7 @@
 		<form method="post" action="?do=serversetup">
 			<input type="hidden" name="token" value="{{token}}">
 			<input type="hidden" name="action" value="savebootentry">
-			<input type="hidden" name="entryid" value="{{entryid}}">
+			<input type="hidden" name="entryid" value="{{oldentryid}}">
 
 			<div class="form-group">
 				<div class="radio">
-- 
cgit v1.2.3-55-g7522