diff options
| author | michael pereira | 2011-03-21 15:19:23 +0100 |
|---|---|---|
| committer | michael pereira | 2011-03-21 15:19:23 +0100 |
| commit | 7eb49950cff52458fa4a4688099adfc59b6c0437 (patch) | |
| tree | 4fbe067cdd9853dcdadddd04bff726308e93151d /application/modules/user/controllers | |
| parent | Preboot und BootISO fertig (diff) | |
| parent | fbgui: serialnumber von bootmedium wird berücksichtigt zur Gruppenfindung (diff) | |
| download | pbs2-7eb49950cff52458fa4a4688099adfc59b6c0437.tar.gz pbs2-7eb49950cff52458fa4a4688099adfc59b6c0437.tar.xz pbs2-7eb49950cff52458fa4a4688099adfc59b6c0437.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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php index 444a33a..307c40d 100644 --- a/application/modules/user/controllers/FilterController.php +++ b/application/modules/user/controllers/FilterController.php @@ -206,13 +206,16 @@ class User_FilterController extends Zend_Controller_Action // TODO: get all child groups $grouppMapper = new Application_Model_GroupMapper(); - $groups = $grouppMapper->findBY('groupID',$this->membership->getGroupID()); + $group = new Application_Model_Group(); + $grouppMapper->find($this->membership->getGroupID(),$group); + $groups[] = $group->toArray(); $clientMapper = new Application_Model_ClientMapper(); $clients = $clientMapper->findBY('groupID',$this->membership->getGroupID()); return array ( 'clients' => $clients, 'memberships' => $memberships, + 'groups' => $groups, 'bootisos' => $bootisos, 'pools' => $pools); @@ -246,7 +249,7 @@ class User_FilterController extends Zend_Controller_Action $addform = new user_Form_FilterEntry(array('buttontext' => 'Add Filterentry', 'selectData' => $selectData, 'data'=>$_POST - )); + )); if ($addform->isValid($_POST)) { print_a('valid'); $newfilterenty = new Application_Model_FilterEntries(); |