diff options
| author | Simon | 2011-04-11 15:20:08 +0200 |
|---|---|---|
| committer | Simon | 2011-04-11 15:20:08 +0200 |
| commit | e2efbc3d4c4c52a0fd86a7a5d81c9ae05fce27f0 (patch) | |
| tree | 07c0e8f79e35a005a25efa4cb6edf3af82102ad6 /application/modules/user/controllers/ConfigController.php | |
| parent | fallbacks in session hinzugefügt (diff) | |
| parent | fixes (diff) | |
| download | pbs2-e2efbc3d4c4c52a0fd86a7a5d81c9ae05fce27f0.tar.gz pbs2-e2efbc3d4c4c52a0fd86a7a5d81c9ae05fce27f0.tar.xz pbs2-e2efbc3d4c4c52a0fd86a7a5d81c9ae05fce27f0.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers/ConfigController.php')
| -rw-r--r-- | application/modules/user/controllers/ConfigController.php | 11 |
1 files changed, 6 insertions, 5 deletions
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)) { |