diff options
Diffstat (limited to 'application/modules/user/controllers/BootmenuController.php')
| -rw-r--r-- | application/modules/user/controllers/BootmenuController.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php index e0b27e6..1b0490c 100644 --- a/application/modules/user/controllers/BootmenuController.php +++ b/application/modules/user/controllers/BootmenuController.php @@ -325,6 +325,8 @@ class user_BootmenuController extends Zend_Controller_Action $bootoslist = array(); $parents = $groupgroupsMapper->getParentGroups($groupID); + $configlist = array('Preset' => array(), 'Custom' => Array()); + foreach($parents as $k => $parent){ foreach($parent as $p){ $bootos = $bootosMapper->findBy(array("groupID" => $p)); @@ -333,13 +335,14 @@ class user_BootmenuController extends Zend_Controller_Action $grouptitle = $groupMapper->find($p)->getTitle(); $bootoslist[$b->getID()] = $b; $bootosanzeige[$grouptitle][$b->getID()] = $b->getTitle(); + $configlist['Preset'][$b->getID()] = $configMapper->findBy(array('groupID' => $groupID, 'bootosID' => $b->getID(), 'visible' => '1')); + $configlist['Custom'][$b->getID()] = $configMapper->findBy(array('membershipID' => $this->membership->getID(), 'bootosID' => $b->getID(), 'visible' => '1')); } } } - $configlist = array('Preset' => array(), 'Custom' => Array()); - $configlist['Preset'] = $configMapper->findBy(array('groupID' => $groupID)); - $configlist['Custom'] = $configMapper->findBy(array('membershipID' => $this->membership->getID())); + + $bootmenu = new Application_Model_BootMenu(); $this->bootmenuMapper->find($bootmenuID, $bootmenu); @@ -444,13 +447,12 @@ class user_BootmenuController extends Zend_Controller_Action $grouptitle = $groupMapper->find($p)->getTitle(); $bootoslist[$b->getID()] = $b; $bootosanzeige[$grouptitle][$b->getID()] = $b->getTitle(); + $configlist['Preset'][$b->getID()] = $configMapper->findBy(array('groupID' => $groupID, 'bootosID' => $b->getID(), 'visible' => '1')); + $configlist['Custom'][$b->getID()] = $configMapper->findBy(array('membershipID' => $this->membership->getID(), 'bootosID' => $b->getID(), 'visible' => '1')); + } } } - - $configlist = array('Preset' => array(), 'Custom' => Array()); - $configlist['Preset'] = $configMapper->findBy(array('groupID' => $groupID)); - $configlist['Custom'] = $configMapper->findBy(array('membershipID' => $this->membership->getID())); $bootmenuentry = new Application_Model_BootMenuEntries(); $bootmenu = new Application_Model_BootMenu(); |