diff options
author | michael pereira | 2011-04-08 16:00:17 +0200 |
---|---|---|
committer | michael pereira | 2011-04-08 16:00:17 +0200 |
commit | aa31509554252a38150bd2a8fc6d3974e851bfd9 (patch) | |
tree | c68b6890c6be050711fd32599676ca4e560804b8 /application/modules | |
parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
download | pbs2-aa31509554252a38150bd2a8fc6d3974e851bfd9.tar.gz pbs2-aa31509554252a38150bd2a8fc6d3974e851bfd9.tar.xz pbs2-aa31509554252a38150bd2a8fc6d3974e851bfd9.zip |
kcl fixed
Diffstat (limited to 'application/modules')
3 files changed, 24 insertions, 17 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); diff --git a/application/modules/user/forms/BootmenuEntries.php b/application/modules/user/forms/BootmenuEntries.php index 5be1b59..58a2820 100644 --- a/application/modules/user/forms/BootmenuEntries.php +++ b/application/modules/user/forms/BootmenuEntries.php @@ -7,13 +7,8 @@ class user_Form_BootmenuEntries extends Zend_Form private $configlist; private $maxorder; private $action; - private $page; - private $kcl; + private $page; - - public function setKcl($kcl){ - $this->kcl = $kcl; - } public function setAction($action){ $this->action = $action; @@ -48,8 +43,6 @@ class user_Form_BootmenuEntries extends Zend_Form $firstbootos = $this->bootoslist[$key]; $_POST['bootosID'] = $firstbootos->getID(); - if(!isset($this->kcl)) - $this->kcl = true; } $this->setName($this->action); @@ -80,11 +73,11 @@ class user_Form_BootmenuEntries extends Zend_Form $kclactive = $this->createElement('checkbox','kcl'); $kclactive->setAttrib('onChange', "document.getElementById('".$this->action."').submit();"); $kclactive->setLabel('Use default KCL:'); - $kclactive->setValue($this->kcl); + $kclactive->setValue($_POST['kcl']); $this->addElement($kclactive); - if($this->kcl){ + if($_POST['kcl']){ $this->addElement('textarea', 'defaultkcl', array( 'filters' => array('StringTrim'), 'validators' => array( @@ -100,7 +93,7 @@ class user_Form_BootmenuEntries extends Zend_Form )); } - if($this->kcl) + if($_POST['kcl']) $kcllength = 175 - strlen($this->bootoslist[$_POST['bootosID']]->getDefaultkcl()); else $kcllength = 175; diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml index 5d298a5..0b4b12f 100644 --- a/application/modules/user/views/scripts/bootmenu/index.phtml +++ b/application/modules/user/views/scripts/bootmenu/index.phtml @@ -116,7 +116,7 @@ <div class='title'><?php echo $this->escape($bootmenuentry->getTitle()); ?></div> <div class='subtitle'><?php echo $this->escape($bootmenuentry->getBootosID()) ?></div> <div class='details dispnone'> - <label>KCL</label> + <label>Default KCL</label> <div class='item'><?php echo $this->escape($bootmenuentry->getKcl()); ?></div> <label>KCL-Append</label> <div class='item'><?php echo $this->escape($bootmenuentry->getKclappend()); ?></div> |