summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Ritter2019-12-17 14:18:45 +0100
committerSteffen Ritter2019-12-17 14:18:45 +0100
commit1ecbc53f54ff0ddf9be4fb7689e9d4336019616d (patch)
tree14fbaf646b092ecd0788cc529155fc37e038c5e8
parent[statistics] Add filter for runtime and lastboot (diff)
downloadslx-admin-1ecbc53f54ff0ddf9be4fb7689e9d4336019616d.tar.gz
slx-admin-1ecbc53f54ff0ddf9be4fb7689e9d4336019616d.tar.xz
slx-admin-1ecbc53f54ff0ddf9be4fb7689e9d4336019616d.zip
[serversetup-bwlp-ipxe] Show title of referenced menus in entry list
-rw-r--r--modules-available/serversetup-bwlp-ipxe/page.inc.php6
-rw-r--r--modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html2
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 @@
</td>
<td align="right">
{{#refs}}
- <span class="badge">{{refs}}</span>
+ <span class="badge" data-toggle="tooltip" data-placement="top" title="{{menuname}}">{{refs}}</span>
{{/refs}}
</td>
<td align="center">