diff options
author | Simon | 2011-04-11 13:26:27 +0200 |
---|---|---|
committer | Simon | 2011-04-11 13:26:27 +0200 |
commit | 441ffc49230ddedf3e692466bda1fb0d27ace8fd (patch) | |
tree | 6e0b2c34931b60987df7d80186d50a7e3eb3e0df /application/modules | |
parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
download | pbs2-441ffc49230ddedf3e692466bda1fb0d27ace8fd.tar.gz pbs2-441ffc49230ddedf3e692466bda1fb0d27ace8fd.tar.xz pbs2-441ffc49230ddedf3e692466bda1fb0d27ace8fd.zip |
Neues Recht um default Bootmenu zu setzen & Bootmenu-REchte angepasst
Diffstat (limited to 'application/modules')
-rw-r--r-- | application/modules/user/controllers/BootmenuController.php | 4 | ||||
-rw-r--r-- | application/modules/user/views/scripts/bootmenu/index.phtml | 4 |
2 files changed, 4 insertions, 4 deletions
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 @@ <?php if((Pbs_Acl::checkRight('booc') && $this->type== 'group') || (Pbs_Acl::checkRight('booco') && $this->type == 'own')): ?> <?php echo $this->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'))?> <?php endif;?> @@ -39,7 +39,7 @@ <div class='number'><?php echo $k+1 ?></div> <div class='content'> <div class='actions'> - <?php if(Pbs_Acl::checkRight('booai') && $this->type == 'group'): ?> + <?php if(Pbs_Acl::checkRight('boodbm') && $this->type == 'group'): ?> <?php if($bootmenu->getDefaultbootmenu() == true): ?> <a><img src='/media/img/default.png' alt='Checked as default'/></a> <?php else: ?> |