Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

1 files changed, 5 insertions, 3 deletions

diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index a7bfb56..e60679a 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -8,6 +8,7 @@ class user_BootmenuController extends Zend_Controller_Action
 	protected $membershipMapper;
 	protected $membership;
 	protected $page;
+	protected $type;
 	
     public function init()
     {
@@ -109,7 +110,8 @@ class user_BootmenuController extends Zend_Controller_Action
 	    // Search
 		$search = $this->_request->getParam('search');
 		$mySearch = new Pbs_Search();
-		$mySearch->setSearchTerm($search);
+		$mySearch->setSearchTerm($search);		
+		$mySearch->setType($this->type);
 		$mySearch->setModule('bootmenu');
 		if($search != ''){
 			$this->view->search = $mySearch->getSearchTerm();			
@@ -255,7 +257,7 @@ class user_BootmenuController extends Zend_Controller_Action
     {
     	
     	//ACL Is he allowed to set Bootmenu as Default?
-    	if(!Pbs_Acl::checkRight('booai'))
+    	if(!Pbs_Acl::checkRight('boodbm'))
     		$this->_redirect('/user/bootmenu/index/type/'.$this->type.'/page/'.$this->page.'/modifyresult/forbidden');
 	    
     	try{		
@@ -444,7 +446,7 @@ class user_BootmenuController extends Zend_Controller_Action
 	    	if($this->membership->getID() != $bootmenu->getMembershipID() || !Pbs_Acl::checkRight('booeeo'))
 		   		$this->_redirect('/user/bootmenu/index/type/'.$this->type.'/page/'.$this->page.'/modifyresult/forbidden');
 	    }else{
-	    	if($this->membership->getGroupID() != $bootmenu->getGroupID() || !Pbs_Acl::checkRight('booee'))
+	    	if($this->membership->getGroupID() != $bootmenu->getGroupID() || (!Pbs_Acl::checkRight('booee') && !Pbs_Acl::checkRight('booeem')))
 	   			$this->_redirect('/user/bootmenu/index/type/'.$this->type.'/page/'.$this->page.'/modifyresult/forbidden');
 	    }