diff options
| author | Steffen Ritter | 2019-12-17 14:41:29 +0100 |
|---|---|---|
| committer | Steffen Ritter | 2019-12-17 14:41:29 +0100 |
| commit | ecda1f7e4ec15133bc7a96f8d1c023db7565b6d5 (patch) | |
| tree | 34d9d5fc5d0b307530733d01d501ef9db1f47b23 | |
| parent | Revert "[roomplanner] Make client tooltip more readable" (diff) | |
| download | slx-admin-ecda1f7e4ec15133bc7a96f8d1c023db7565b6d5.tar.gz slx-admin-ecda1f7e4ec15133bc7a96f8d1c023db7565b6d5.tar.xz slx-admin-ecda1f7e4ec15133bc7a96f8d1c023db7565b6d5.zip | |
Revert "[serversetup-bwlp-ipxe] Show title of referenced menus in entry list"
This reverts commit 5fb820a9549b51d5ee34dc2fe0fb041cd0e941c6.
Was not included in 3.8b release
| -rw-r--r-- | modules-available/serversetup-bwlp-ipxe/page.inc.php | 7 | ||||
| -rw-r--r-- | modules-available/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 @@ </td> <td align="right"> {{#refs}} - <span class="badge" data-toggle="tooltip" data-placement="top" title="{{menuname}}">{{refs}}</span> + <span class="badge">{{refs}}</span> {{/refs}} </td> <td align="center"> |