diff options
| author | michael pereira | 2011-04-11 15:15:00 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-11 15:15:00 +0200 |
| commit | 97383600c745298d595e6ee6258cc0f0e769c65a (patch) | |
| tree | 919ad049b81c9472ee8abe23a1814e420f7a8281 /application/modules/user/controllers | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-97383600c745298d595e6ee6258cc0f0e769c65a.tar.gz pbs2-97383600c745298d595e6ee6258cc0f0e769c65a.tar.xz pbs2-97383600c745298d595e6ee6258cc0f0e769c65a.zip | |
fixes
Diffstat (limited to 'application/modules/user/controllers')
| -rw-r--r-- | application/modules/user/controllers/BootmenuController.php | 11 | ||||
| -rw-r--r-- | application/modules/user/controllers/ConfigController.php | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php index e60679a..deea70d 100644 --- a/application/modules/user/controllers/BootmenuController.php +++ b/application/modules/user/controllers/BootmenuController.php @@ -147,10 +147,10 @@ class user_BootmenuController extends Zend_Controller_Action $this->_redirect('/user/bootmenu/index/type/'.$this->type.'/page/'.$this->page.'/addresult/forbidden'); if (!isset($_POST["createbootmenu"])){ - $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page)); + $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page, 'type'=>$this->type)); } else { - $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page),$_POST); + $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page, 'type'=>$this->type),$_POST); if ($bootmenuForm->isValid($_POST)) { @@ -192,11 +192,11 @@ class user_BootmenuController extends Zend_Controller_Action if (!isset($_POST["editbootmenu"])){ - $bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page)); + $bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page, 'type'=>$this->type)); $bootmenuForm->populate($bootmenu->toArray()); }else{ - $bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page),$_POST); + $bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page, 'type'=>$this->type),$_POST); if ($bootmenuForm->isValid($_POST)) { @@ -451,7 +451,8 @@ class user_BootmenuController extends Zend_Controller_Action } if (!isset($_POST["editbootmenuentry"])){ - + if(!isset($_POST['bootosID'])) + $_POST['bootosID'] = $bootmenuentry->getBootosID(); if(!isset($_POST['kcl'])) $_POST['kcl'] = $bootmenuentry->getKcl(); diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php index a38af00..2491c0e 100644 --- a/application/modules/user/controllers/ConfigController.php +++ b/application/modules/user/controllers/ConfigController.php @@ -30,7 +30,8 @@ class user_ConfigController extends Zend_Controller_Action } else { $this->_helper->redirector('login', 'auth'); } - $this->page = $this->_request->getParam('page'); } + $this->page = $this->_request->getParam('page'); + } public function indexAction() { @@ -106,9 +107,9 @@ class user_ConfigController extends Zend_Controller_Action $this->_redirect('/user/config/index/type/'.$this->type.'/page/'.$this->page.'/addresult/forbidden'); if (!isset($_POST["createconfig"])){ - $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page)); + $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page, 'type'=>$this->type)); } else { - $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page),$_POST); + $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page, 'type'=>$this->type),$_POST); if ($configForm->isValid($_POST)) { @@ -162,11 +163,11 @@ class user_ConfigController extends Zend_Controller_Action if (!isset($_POST["editconfig"])){ - $configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page)); + $configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page, 'type'=>$this->type)); $configForm->populate($config->toArray()); }else{ - $configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page),$_POST); + $configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page, 'type'=>$this->type),$_POST); if ($configForm->isValid($_POST)) { |