summaryrefslogtreecommitdiffstats
path: root/application/controllers/BootmenuController.php
diff options
context:
space:
mode:
authorSimon2011-03-09 14:43:47 +0100
committerSimon2011-03-09 14:43:47 +0100
commit93fa92b857d53b7f9c9841336a32d3a177b20994 (patch)
tree740e8a4d978ec08e22044ee162d7b9ce20c89023 /application/controllers/BootmenuController.php
parentIcons ins Oberlfäche hinzugefügt & Views geupdated & style geupdated & sele... (diff)
parentController Validation fix (diff)
downloadpbs2-93fa92b857d53b7f9c9841336a32d3a177b20994.tar.gz
pbs2-93fa92b857d53b7f9c9841336a32d3a177b20994.tar.xz
pbs2-93fa92b857d53b7f9c9841336a32d3a177b20994.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/controllers/BootmenuController.php')
-rw-r--r--application/controllers/BootmenuController.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/application/controllers/BootmenuController.php b/application/controllers/BootmenuController.php
index 239aa4f..93d541d 100644
--- a/application/controllers/BootmenuController.php
+++ b/application/controllers/BootmenuController.php
@@ -46,7 +46,7 @@ class BootmenuController extends Zend_Controller_Action
$addbootmenuentryForm->populate(array('order' => $this->_request->getParam('maxorder')));
} else {
- $addbootmenuentryForm = new Application_Form_BootmenuEntriesAdd($_POST);
+ $addbootmenuentryForm = new Application_Form_BootmenuEntriesAdd(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()),$_POST);
if ($addbootmenuentryForm->isValid($_POST)) {
@@ -83,7 +83,7 @@ class BootmenuController extends Zend_Controller_Action
$createbootmenuForm = new Application_Form_BootmenuCreate(array('grouplist' => $groupmapper->fetchAll()));
} else {
- $createbootmenuForm = new Application_Form_BootmenuCreate($_POST);
+ $createbootmenuForm = new Application_Form_BootmenuCreate(array('grouplist' => $groupmapper->fetchAll()),$_POST);
if ($createbootmenuForm->isValid($_POST)) {
@@ -125,7 +125,7 @@ class BootmenuController extends Zend_Controller_Action
$editbootmenuForm->populate($bootmenu->toArray());
}
}else{
- $editbootmenuForm = new Application_Form_BootmenuEdit($_POST);
+ $editbootmenuForm = new Application_Form_BootmenuEdit(array('grouplist' => $groupmapper->fetchAll()),$_POST);
if ($editbootmenuForm->isValid($_POST)) {
@@ -173,7 +173,7 @@ class BootmenuController extends Zend_Controller_Action
$editbootmenuentryForm->populate($bootmenuentry->toArray());
}
}else{
- $editbootmenuentryForm = new Application_Form_BootmenuEntriesEdit($_POST);
+ $editbootmenuentryForm = new Application_Form_BootmenuEntriesEdit(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()),$_POST);
if ($editbootmenuentryForm->isValid($_POST)) {