diff options
| author | michael pereira | 2011-04-10 21:05:31 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-10 21:05:31 +0200 |
| commit | db0e610aa4b58a55604b2a0474f697333d839d10 (patch) | |
| tree | cc2b9e0031a1280b9394df85df4297fd326cb548 /application/modules/user/controllers | |
| parent | Config Own/Group getrennt (diff) | |
| parent | Disabled oder Readonly-Elemente werden immer ausgegraut und haben den normale... (diff) | |
| download | pbs2-db0e610aa4b58a55604b2a0474f697333d839d10.tar.gz pbs2-db0e610aa4b58a55604b2a0474f697333d839d10.tar.xz pbs2-db0e610aa4b58a55604b2a0474f697333d839d10.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers')
| -rw-r--r-- | application/modules/user/controllers/FilterController.php | 9 | ||||
| -rw-r--r-- | application/modules/user/controllers/PoolController.php | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php index ead81ab..a65aba5 100644 --- a/application/modules/user/controllers/FilterController.php +++ b/application/modules/user/controllers/FilterController.php @@ -260,14 +260,13 @@ class User_FilterController extends Zend_Controller_Action private function prepareFormData(){ $poolMapper = new Application_Model_PoolMapper(); - $pools = $poolMapper->findBY('groupID',$this->membership->getGroupID()); + $pools = $poolMapper->findBy(array('groupID'=>$this->membership->getGroupID()),true); $bootisoMapper = new Application_Model_BootIsoMapper(); - $bootisos = $bootisoMapper->findBY('groupID',$this->membership->getGroupID(),true); + $bootisos = $bootisoMapper->findBy(array('groupID'=>$this->membership->getGroupID()),true); $membershipMapper = new Application_Model_MembershipMapper(); - $memberships = $membershipMapper->findBY('groupID',$this->membership->getGroupID()); - + $memberships = $membershipMapper->findBy(array('groupID'=>$this->membership->getGroupID()),true); $grouppMapper = new Application_Model_GroupMapper(); $group = new Application_Model_Group(); @@ -275,7 +274,7 @@ class User_FilterController extends Zend_Controller_Action $groups[] = $group->toArray(); $clientMapper = new Application_Model_ClientMapper(); - $clients = $clientMapper->findBY('groupID',$this->membership->getGroupID()); + $clients = $clientMapper->findBy(array('groupID'=>$this->membership->getGroupID()),true); return array ( 'clients' => $clients, 'memberships' => $memberships, diff --git a/application/modules/user/controllers/PoolController.php b/application/modules/user/controllers/PoolController.php index 87f330a..942f988 100644 --- a/application/modules/user/controllers/PoolController.php +++ b/application/modules/user/controllers/PoolController.php @@ -132,10 +132,10 @@ class User_PoolController extends Zend_Controller_Action $pool->setGroupID($this->membership->getGroupID()); $poolmapper = new Application_Model_PoolMapper(); $poolmapper->save($pool); - $this->_redirect('/dev/pool/index/addresult/ok'); + $this->_redirect('/user/pool/index/addresult/ok'); }catch (Zend_Exception $e) { echo "Error message 2: " . $e->getMessage() . "\n"; - $this->_redirect('/dev/pool/index/addresult/error'); + $this->_redirect('/user/pool/index/addresult/error'); } } $this->view->addpool = $addpoolform; |