summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'application/modules/user/controllers')
-rw-r--r--application/modules/user/controllers/BootmenuController.php24
1 files changed, 19 insertions, 5 deletions
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index e3513e0..03d0362 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -73,6 +73,12 @@ class user_BootmenuController extends Zend_Controller_Action
$bootmenuID = $bm->getID();
$bootmenuentries[$bootmenuID] = $this->bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID));
foreach ($bootmenuentries[$bootmenuID] as $bootmenuentry){
+ if($bootmenuentry->getKcl())
+ $bootmenuentry->setKcl($bootosMapper->find($bootmenuentry->getBootosID())->getDefaultkcl());
+ else
+ $bootmenuentry->setKcl("deactivated (edit Bootmenuentry to activate)");
+ if($bootmenuentry->getKclappend() == null)
+ $bootmenuentry->setKclappend("none (edit Bootmenuentry to set KCL-Append)");
$bootmenuentry->setBootosID("[".$bootmenuentry->getBootosID()."] ".$bootosMapper->find($bootmenuentry->getBootosID())->getTitle());
$bootmenuentry->setConfigID("[".$bootmenuentry->getConfigID()."] ".$configMapper->find($bootmenuentry->getConfigID())->gettitle());
}
@@ -84,6 +90,12 @@ class user_BootmenuController extends Zend_Controller_Action
$bootmenuID = $bootmenu[0]->getID();
$bootmenuentries[$bootmenuID] = $this->bootmenuentriesMapper->findBy(array('bootmenuID' => $bootmenuID));
foreach ($bootmenuentries[$bootmenuID] as $bootmenuentry){
+ if($bootmenuentry->getKcl())
+ $bootmenuentry->setKcl($bootosMapper->find($bootmenuentry->getBootosID())->getDefaultkcl());
+ else
+ $bootmenuentry->setKcl("deactivated (edit Bootmenuentry to activate)");
+ if($bootmenuentry->getKclappend() == null)
+ $bootmenuentry->setKclappend("none");
$bootmenuentry->setBootosID("[".$bootmenuentry->getBootosID()."] ".$bootosMapper->find($bootmenuentry->getBootosID())->getTitle());
$bootmenuentry->setConfigID("[".$bootmenuentry->getConfigID()."] ".$configMapper->find($bootmenuentry->getConfigID())->gettitle());
}
@@ -313,6 +325,9 @@ class user_BootmenuController extends Zend_Controller_Action
if (!isset($_POST["addbootmenuentry"])){
+ if(!isset($_POST['kcl']))
+ $_POST['kcl'] = true;
+
$bootmenuentryForm = new user_Form_BootmenuEntries(array(
'bootoslist'=> $bootoslist,
'bootosanzeige' => $bootosanzeige,
@@ -320,7 +335,6 @@ class user_BootmenuController extends Zend_Controller_Action
'configlist'=> $configlist,
'page' => $this->page,
'action' => 'addbootmenuentry',
- 'kcl' => $_POST['kcl']
));
$bootmenuentryForm->populate(array('order' => $maxorder));
@@ -337,7 +351,6 @@ class user_BootmenuController extends Zend_Controller_Action
'configlist'=>$configlist,
'page' => $this->page,
'action' => 'addbootmenuentry',
- 'kcl' => $_POST['kcl']
),$_POST);
if ($bootmenuentryForm->isValid($_POST)) {
@@ -418,12 +431,14 @@ class user_BootmenuController extends Zend_Controller_Action
if (!isset($_POST["editbootmenuentry"])){
+ if(!isset($_POST['kcl']))
+ $_POST['kcl'] = $bootmenuentry->getKcl();
+
$bootmenuentryForm = new user_Form_BootmenuEntries(array(
'bootoslist'=> $bootoslist,
'bootosanzeige' => $bootosanzeige,
'maxorder'=> $maxorder-1,
'configlist'=> $configlist,
- 'kcl' => $bootmenuentry->getKcl(),
'page' => $this->page,
'action' => 'editbootmenuentry',
));
@@ -432,7 +447,7 @@ class user_BootmenuController extends Zend_Controller_Action
$bootmenuentryForm->populate($bootmenuentry->toArray());
}
else{
- unset($_POST['kcl']);
+ unset($_POST['defaultkcl']);
unset($_POST['configID']);
$bootmenuentryForm->populate($_POST);
}
@@ -443,7 +458,6 @@ class user_BootmenuController extends Zend_Controller_Action
'bootosanzeige' => $bootosanzeige,
'maxorder'=> $maxorder-1,
'configlist'=> $configlist,
- 'kcl' => $bootmenuentry->getKcl(),
'page' => $this->page,
'action' => 'editbootmenuentry'),$_POST);