From 1ecbc53f54ff0ddf9be4fb7689e9d4336019616d Mon Sep 17 00:00:00 2001 From: Steffen Ritter Date: Tue, 17 Dec 2019 14:18:45 +0100 Subject: [serversetup-bwlp-ipxe] Show title of referenced menus in entry list --- modules-available/serversetup-bwlp-ipxe/page.inc.php | 6 ++++-- .../serversetup-bwlp-ipxe/templates/bootentry-list.html | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php index a636665e..b3c9917c 100644 --- a/modules-available/serversetup-bwlp-ipxe/page.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php @@ -298,9 +298,11 @@ class Page_ServerSetup extends Page { $allowEdit = User::hasPermission('ipxe.bootentry.edit'); - $bootentryTable = Database::queryAll("SELECT be.entryid, be.hotkey, be.title, be.builtin, be.module, Count(sm.menuid) AS refs + $bootentryTable = Database::queryAll("SELECT be.entryid, be.hotkey, be.title, be.builtin, be.module, Count(sme.menuid) AS refs, + GROUP_CONCAT(sm.title SEPARATOR ', ') as menuname FROM serversetup_bootentry be - LEFT JOIN serversetup_menuentry sm USING (entryid) + LEFT JOIN serversetup_menuentry sme USING (entryid) + LEFT JOIN serversetup_menu sm USING (menuid) GROUP BY be.entryid, be.title ORDER BY be.title ASC"); diff --git a/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html b/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html index 9eecc6f5..c4018bef 100644 --- a/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html +++ b/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html @@ -37,7 +37,7 @@ {{#refs}} - {{refs}} + {{refs}} {{/refs}} -- cgit v1.2.3-55-g7522