![Checked as default](/media/img/default.png)
From de707b3d0199905b201b09d842942845e70781e4 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 11 Apr 2011 10:40:42 +0200 Subject: Suche in Bootmenu gefixxt --- application/modules/user/controllers/BootmenuController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'application/modules/user/controllers/BootmenuController.php') diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php index ed2239b..754c45d 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(); -- cgit v1.2.3-55-g7522 From 441ffc49230ddedf3e692466bda1fb0d27ace8fd Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 11 Apr 2011 13:26:27 +0200 Subject: Neues Recht um default Bootmenu zu setzen & Bootmenu-REchte angepasst --- .../user/controllers/BootmenuController.php | 4 ++-- .../user/views/scripts/bootmenu/index.phtml | 4 ++-- mysqlGraph.png | Bin 279960 -> 280861 bytes pbs.sql | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'application/modules/user/controllers/BootmenuController.php') diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php index 754c45d..30e4098 100644 --- a/application/modules/user/controllers/BootmenuController.php +++ b/application/modules/user/controllers/BootmenuController.php @@ -257,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{ @@ -446,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'); } diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml index 4393c1f..cda6f87 100644 --- a/application/modules/user/views/scripts/bootmenu/index.phtml +++ b/application/modules/user/views/scripts/bootmenu/index.phtml @@ -7,7 +7,7 @@ type== 'group') || (Pbs_Acl::checkRight('booco') && $this->type == 'own')): ?> formButton('createbootmenu', 'Create BootMenu', array( - 'onclick' => 'self.location="/user/bootmenu/createbootmenu/type/'.$this->type.'page/'.$this->page.'"', + 'onclick' => 'self.location="/user/bootmenu/createbootmenu/type/'.$this->type.'/page/'.$this->page.'"', 'class' => 'addbutton'))?> @@ -39,7 +39,7 @@