diff options
| author | michael pereira | 2011-04-26 18:16:50 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-26 18:16:50 +0200 |
| commit | 208a8156c83b59e56777329a7ef803bd867ac5c0 (patch) | |
| tree | 705d195e1f6b8da34a220021be0e78553ef6b68f /application/modules/user/controllers | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-208a8156c83b59e56777329a7ef803bd867ac5c0.tar.gz pbs2-208a8156c83b59e56777329a7ef803bd867ac5c0.tar.xz pbs2-208a8156c83b59e56777329a7ef803bd867ac5c0.zip | |
config fix
Diffstat (limited to 'application/modules/user/controllers')
| -rw-r--r-- | application/modules/user/controllers/ConfigController.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php index 10aad3a..b271974 100644 --- a/application/modules/user/controllers/ConfigController.php +++ b/application/modules/user/controllers/ConfigController.php @@ -111,12 +111,12 @@ class user_ConfigController extends Zend_Controller_Action $this->view->bootoslist[] = $b; if(Pbs_Acl::checkRight('cc')){ $ownerconfs = $this->configMapper->findBy(array('groupID' => $b->getGroupID(), 'membershipID' => null, 'bootosID' => $b->getID())); - if($groupID != $b->getID()) + if($groupID != $b->getGroupID()) $groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID())); $this->view->configlist[$b->getID()] = array_merge($ownerconfs,$groupconfs); }else{ $ownerconfs = $this->configMapper->findBy(array('groupID' => $b->getGroupID(), 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1')); - if($groupID != $b->getID()) + if($groupID != $b->getGroupID()) $groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1')); $this->view->configlist[$b->getID()] = array_merge($ownerconfs,$groupconfs); @@ -129,12 +129,12 @@ class user_ConfigController extends Zend_Controller_Action $this->view->bootoslist[] = $b; if(Pbs_Acl::checkRight('cc')){ $ownerconfs = $this->configMapper->findBy(array('groupID' => $b->getGroupID(), 'membershipID' => null, 'bootosID' => $b->getID())); - if($groupID != $b->getID()) + if($groupID != $b->getGroupID()) $groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID())); $this->view->configlist[$b->getID()] = array_merge($ownerconfs,$groupconfs); }else{ $ownerconfs = $this->configMapper->findBy(array('groupID' => $b->getGroupID(), 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1')); - if($groupID != $b->getID()) + if($groupID != $b->getGroupID()) $groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1')); $this->view->configlist[$b->getID()] = array_merge($ownerconfs,$groupconfs); } |