From 847c6ef5d74992f0a453a12ea65924a5e4b68964 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 19 Mar 2019 16:45:01 +0100 Subject: [serversetup-bwlp-ipxe] Fix incomplete bootentries, hide arch select For type "script", the architecture options do nothing. Hide. --- .../serversetup-bwlp-ipxe/page.inc.php | 9 +++++++++ .../templates/ipxe-new-boot-entry.html | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) (limited to 'modules-available/serversetup-bwlp-ipxe') diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php index 4941a44b..de802da8 100644 --- a/modules-available/serversetup-bwlp-ipxe/page.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php @@ -475,6 +475,15 @@ class Page_ServerSetup extends Page $params['title'] = $row['title']; $params['oldentryid'] = $params['entryid'] = $row['entryid']; $params['builtin'] = $row['builtin']; + if (!is_array($params['entries'])) { + $params['entries'] = []; + } + if (!in_array(['mode' => 'PCBIOS'], $params['entries'])) { + $params['entries'][] = ['mode' => 'PCBIOS']; + } + if (!in_array(['mode' => 'EFI'], $params['entries'])) { + $params['entries'][] = ['mode' => 'EFI']; + } $params['menus'] = Database::queryAll('SELECT m.menuid, m.title FROM serversetup_menu m INNER JOIN serversetup_menuentry me ON (me.menuid = m.menuid) WHERE me.entryid = :entryid', ['entryid' => $row['entryid']]); 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 687c312b..a6955642 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 @@ -39,19 +39,19 @@ -
- - -
+
+ + +
{{#entries}}
-- cgit v1.2.3-55-g7522