diff options
| author | Simon | 2011-04-26 18:28:26 +0200 |
|---|---|---|
| committer | Simon | 2011-04-26 18:28:26 +0200 |
| commit | 05e9fe751d24748b0e1784dc42dd11d280891ca4 (patch) | |
| tree | 55d4358aa258b536c2de0c6a54c3ae02815faa50 | |
| parent | Added Group-Description in Layout (diff) | |
| parent | config fix (diff) | |
| download | pbs2-05e9fe751d24748b0e1784dc42dd11d280891ca4.tar.gz pbs2-05e9fe751d24748b0e1784dc42dd11d280891ca4.tar.xz pbs2-05e9fe751d24748b0e1784dc42dd11d280891ca4.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
| -rw-r--r-- | application/modules/user/controllers/ConfigController.php | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php index bf79151..b271974 100644 --- a/application/modules/user/controllers/ConfigController.php +++ b/application/modules/user/controllers/ConfigController.php @@ -111,12 +111,14 @@ 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())); - $groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID())); - $this->view->configlist[$b->getID()] = array_unique(array_merge($ownerconfs,$groupconfs)); + 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')); - $groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1')); - $this->view->configlist[$b->getID()] = array_unique(array_merge($ownerconfs,$groupconfs)); + 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); } foreach ($this->view->configlist[$b->getID()] as $config){ @@ -127,12 +129,14 @@ 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())); - $groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID())); - $this->view->configlist[$b->getID()] = array_unique(array_merge($ownerconfs,$groupconfs)); + 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')); - $groupconfs = $this->configMapper->findBy(array('groupID' => $groupID, 'membershipID' => null, 'bootosID' => $b->getID(), 'visible' => '1')); - $this->view->configlist[$b->getID()] = array_unique(array_merge($ownerconfs,$groupconfs)); + 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); } foreach ($this->view->configlist[$b->getID()] as $config){ $config->setCreated(date(Zend_Registry::get('dateformat'),$config->getCreated())); |