From ecda1f7e4ec15133bc7a96f8d1c023db7565b6d5 Mon Sep 17 00:00:00 2001 From: Steffen Ritter Date: Tue, 17 Dec 2019 14:41:29 +0100 Subject: Revert "[serversetup-bwlp-ipxe] Show title of referenced menus in entry list" This reverts commit 5fb820a9549b51d5ee34dc2fe0fb041cd0e941c6. Was not included in 3.8b release --- modules-available/serversetup-bwlp-ipxe/page.inc.php | 7 ++----- .../serversetup-bwlp-ipxe/templates/bootentry-list.html | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php index 56b41d4e..6a874775 100644 --- a/modules-available/serversetup-bwlp-ipxe/page.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php @@ -298,11 +298,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(sme.menuid) AS refs, - GROUP_CONCAT(sm.title SEPARATOR ', ') as menuname - FROM serversetup_bootentry be - LEFT JOIN serversetup_menuentry sme USING (entryid) - LEFT JOIN serversetup_menu sm USING (menuid) + $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 = []; diff --git a/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html b/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html index 4044c666..dfc4e6a8 100644 --- a/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html +++ b/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html @@ -33,7 +33,7 @@ {{#refs}} - {{refs}} + {{refs}} {{/refs}} -- cgit v1.2.3-55-g7522