diff options
| author | Simon Rettberg | 2016-04-29 20:55:59 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-04-29 20:55:59 +0200 |
| commit | cbd23b7d191327a7cfb6a98e657659045da71af3 (patch) | |
| tree | f029ab85c3ac07d3f2a56b4359fd36c265898d6d /modules/serversetup/page.inc.php | |
| parent | More Progress; Merged changes from ufpr up to 775cdbd29f5d0f70946d1d5ff09c091... (diff) | |
| download | slx-admin-cbd23b7d191327a7cfb6a98e657659045da71af3.tar.gz slx-admin-cbd23b7d191327a7cfb6a98e657659045da71af3.tar.xz slx-admin-cbd23b7d191327a7cfb6a98e657659045da71af3.zip | |
Second half of merge....
Diffstat (limited to 'modules/serversetup/page.inc.php')
| -rw-r--r-- | modules/serversetup/page.inc.php | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/modules/serversetup/page.inc.php b/modules/serversetup/page.inc.php index e37d7d40..289bf3d5 100644 --- a/modules/serversetup/page.inc.php +++ b/modules/serversetup/page.inc.php @@ -65,19 +65,27 @@ class Page_ServerSetup extends Page Render::addTemplate('ipxe_update', array('taskid' => $taskid)); } - Render::addTemplate('ipaddress', array( - 'ips' => $this->taskStatus['data']['addresses'] - )); - $data = $this->currentMenu; - if (!isset($data['defaultentry'])) - $data['defaultentry'] = 'net'; - if ($data['defaultentry'] === 'net') - $data['active-net'] = 'checked'; - if ($data['defaultentry'] === 'hdd') - $data['active-hdd'] = 'checked'; - if ($data['defaultentry'] === 'custom') - $data['active-custom'] = 'checked'; - Render::addTemplate('ipxe', $data); + if (Request::get('advanced', 'false', 'string') === 'false') { + Render::addTemplate('ipxe-smp'); + } else { + Render::addTemplate('ipaddress', array( + 'ips' => $this->taskStatus['data']['addresses'] + )); + $data = $this->currentMenu; + if (!isset($data['defaultentry'])) + $data['defaultentry'] = 'net'; + if ($data['defaultentry'] === 'net') + $data['active-net'] = 'checked'; + if ($data['defaultentry'] === 'hdd') + $data['active-hdd'] = 'checked'; + if ($data['defaultentry'] === 'custom') + $data['active-custom'] = 'checked'; + //There is no $this->username and no pxe.embed, why do we need this? + //Page won't load with lines below uncommented + //$data['username'] = $this->username; + //$data['script'] = file_get_contents("/opt/taskmanager/data/pxe.embed"); + Render::addTemplate('ipxe-adv', $data); + } } // ----------------------------------------------------------------------------------------------- |