diff options
Diffstat (limited to 'modules-available')
4 files changed, 22 insertions, 2 deletions
diff --git a/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php index 20b0457f..0c20e839 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/ipxemenu.inc.php @@ -103,6 +103,18 @@ class IPxeMenu return false; } + /** + * @return MenuEntry|null Return preselected menu entry + */ + public function defaultEntry() + { + foreach ($this->items as $item) { + if ($item->menuEntryId() == $this->defaultEntryId) + return $item; + } + return null; + } + /* * */ diff --git a/modules-available/serversetup-bwlp-ipxe/inc/menuentry.inc.php b/modules-available/serversetup-bwlp-ipxe/inc/menuentry.inc.php index 22731bc7..eff7f24e 100644 --- a/modules-available/serversetup-bwlp-ipxe/inc/menuentry.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/inc/menuentry.inc.php @@ -110,6 +110,11 @@ class MenuEntry return $this->menuentryid; } + public function title() + { + return $this->title; + } + /* * */ diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php index 25122a6c..6a874775 100644 --- a/modules-available/serversetup-bwlp-ipxe/page.inc.php +++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php @@ -839,7 +839,7 @@ class Page_ServerSetup extends Page 'locationName' => $loc['locationname'], ]; $menu = IPxeMenu::forLocation($loc['parentlocationid']); - $data['defaultMenu'] = $menu->title(); + $data['defaultMenu'] = $menu; $res = Database::simpleQuery('SELECT m.menuid, m.title, ml.locationid, ml.defaultentryid, GROUP_CONCAT(me.menuentryid) AS entries FROM serversetup_menu m LEFT JOIN serversetup_menu_location ml ON (m.menuid = ml.menuid AND ml.locationid = :locationid) INNER JOIN serversetup_menuentry me ON (m.menuid = me.menuid AND me.entryid IS NOT NULL) diff --git a/modules-available/serversetup-bwlp-ipxe/templates/menu-assign-location.html b/modules-available/serversetup-bwlp-ipxe/templates/menu-assign-location.html index 128d28ea..4e08a346 100644 --- a/modules-available/serversetup-bwlp-ipxe/templates/menu-assign-location.html +++ b/modules-available/serversetup-bwlp-ipxe/templates/menu-assign-location.html @@ -25,7 +25,10 @@ <td> <i>{{lang_useDefaultMenu}}</i> </td> - <td>{{defaultMenu}}</td> + <td> + {{defaultMenu.title}} + <div class="small text-muted">{{defaultMenu.defaultEntry.title}}</div> + </td> </tr> {{#list}} <tr> |