Filter können nurnoch auf eigene BootMenu verweisen

2 files changed, 16 insertions, 29 deletions

diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index c8cd2e5..c9b357c 100644
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
@@ -63,28 +63,16 @@ class User_FilterController extends Zend_Controller_Action
 		if(!Pbs_Acl::checkRight('fa'))
 			$this->_redirect('/user');
 			
-		$rr = new Application_Model_GroupGroupsMapper();
-		$groupMapper = new Application_Model_GroupMapper();
-		$parentGroups = $rr->getParentGroups($this->membership->getGroupID());	
-		$bootmenus = array();	
-		foreach($parentGroups as $parentGroup){
-			foreach($parentGroup as $p){
-				$bmmapper = new Application_Model_BootMenuMapper();
-				$result = $bmmapper->findBy('groupID',$p);
-				foreach($result as $rr){
-					$bm = new Application_Model_BootMenu();
-					$bm->setOptions($rr);
-					$bm->setID($rr['bootmenuID']);
-					if($bm->getMembershipID() == null){										
-						$group = new Application_Model_Group();
-						$groupMapper->find($bm->getGroupID(),$group);
-					
-						$name = $group->getTitle();
-						$bootmenus[$name][$bm->getID()] = $bm->getTitle();
-					}
-				}
-			}
-		}
+		$bmmapper = new Application_Model_BootMenuMapper();
+		$result = $bmmapper->findBy('groupID',$this->membership->getGroupID());
+		
+		foreach($result as $rr){
+			$bm = new Application_Model_BootMenu();
+			$bm->setOptions($rr);
+			$bm->setID($rr['bootmenuID']);
+			$bootmenus[] = $bm;
+		}		
+		
 		
 		$this->view->bootmenus = $bootmenus;
 
diff --git a/application/modules/user/forms/Filter.php b/application/modules/user/forms/Filter.php
index 4526a61..5c20c2a 100644
--- a/application/modules/user/forms/Filter.php
+++ b/application/modules/user/forms/Filter.php
@@ -27,14 +27,13 @@ class user_Form_Filter extends Zend_Form
 		$bootmenufield = $this->createElement('select','bootmenuID');
         $bootmenufield ->setLabel('Bootmenu:');
 
-        /*if(count($this->bootmenus)>0){
-        	foreach($this->bootmenus as $bm){
-				foreach($bm as $id => $g){
-					$bootmenufield->addMultiOption($g->getID(), $g->getTitle());
-				} 
+        if(count($this->bootmenus)>0){
+        	foreach($this->bootmenus as $g){        		
+				$bootmenufield->addMultiOption($g->getID(), $g->getTitle());
+				
 			}     
-        }*/
-        $bootmenufield->setMultioptions($this->bootmenus);
+        }
+       
 		$bootmenufield->setRegisterInArrayValidator(false);
 		$this->addElement($bootmenufield);