diff options
| -rw-r--r-- | application/modules/user/controllers/BootmenuController.php | 4 | ||||
| -rw-r--r-- | application/modules/user/views/scripts/bootmenu/index.phtml | 4 | ||||
| -rw-r--r-- | mysqlGraph.png | bin | 279960 -> 280861 bytes | |||
| -rw-r--r-- | pbs.sql | 4 |
4 files changed, 7 insertions, 5 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: ?> diff --git a/mysqlGraph.png b/mysqlGraph.png Binary files differindex f24c35b..54d0ae5 100644 --- a/mysqlGraph.png +++ b/mysqlGraph.png @@ -504,6 +504,8 @@ INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title` (NULL, '8', 'booai', 'Show admin interface of BootMenu', NULL), -- User-BootMenu anzeigen (NULL, '8', 'booui', 'Show user interface of BootMenu', NULL), + -- Defautl Bootmenu setzen +(NULL, '8', 'boodbm', 'Set default BootMenu', NULL), -- BootMenu anlegen (NULL, '8', 'booc', 'Create BootMenu', NULL), -- BootMenu löschen @@ -578,4 +580,4 @@ INSERT INTO `pbs`.`pbs_group` (`groupID` ,`title` ,`description`)VALUES (1, 'OpenSLX', 'This is the OpenSLX-Group'); INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES (1, '1', 'SuperAdmin', 'The SuperAdmin', 0); INSERT INTO `pbs`.`pbs_rightroles` (`roleID`, `rightID`) VALUES -(1, 1),(1, 2),(1, 3),(1, 4),(1, 5),(1, 6),(1, 7),(1, 8),(1, 9),(1, 10),(1, 11),(1, 12),(1, 13),(1, 14),(1, 15),(1, 16),(1, 17),(1, 18),(1, 19),(1, 20),(1, 21),(1, 22),(1, 23),(1, 24),(1, 25),(1, 26),(1, 27),(1, 28),(1, 29),(1, 30),(1, 31),(1, 32),(1, 33),(1, 34),(1, 35),(1, 36),(1, 37),(1, 38),(1, 39),(1, 40),(1, 41),(1, 42),(1, 43),(1, 44),(1, 45),(1, 46),(1, 47),(1, 48),(1, 49),(1, 50),(1, 51),(1, 52),(1, 53),(1, 54),(1, 55),(1, 56),(1, 57),(1, 58),(1, 59),(1, 60),(1, 61),(1, 62),(1, 63),(1, 64),(1, 65),(1, 66),(1, 67),(1, 68),(1, 69),(1, 70),(1, 71),(1, 72),(1, 73),(1, 74),(1, 75),(1, 76),(1, 77),(1, 78),(1, 79),(1, 80),(1, 81),(1, 82),(1, 83),(1, 84),(1, 85),(1, 86),(1, 87),(1, 88),(1, 89),(1, 90),(1, 91),(1, 92),(1, 93); +(1, 1),(1, 2),(1, 3),(1, 4),(1, 5),(1, 6),(1, 7),(1, 8),(1, 9),(1, 10),(1, 11),(1, 12),(1, 13),(1, 14),(1, 15),(1, 16),(1, 17),(1, 18),(1, 19),(1, 20),(1, 21),(1, 22),(1, 23),(1, 24),(1, 25),(1, 26),(1, 27),(1, 28),(1, 29),(1, 30),(1, 31),(1, 32),(1, 33),(1, 34),(1, 35),(1, 36),(1, 37),(1, 38),(1, 39),(1, 40),(1, 41),(1, 42),(1, 43),(1, 44),(1, 45),(1, 46),(1, 47),(1, 48),(1, 49),(1, 50),(1, 51),(1, 52),(1, 53),(1, 54),(1, 55),(1, 56),(1, 57),(1, 58),(1, 59),(1, 60),(1, 61),(1, 62),(1, 63),(1, 64),(1, 65),(1, 66),(1, 67),(1, 68),(1, 69),(1, 70),(1, 71),(1, 72),(1, 73),(1, 74),(1, 75),(1, 76),(1, 77),(1, 78),(1, 79),(1, 80),(1, 81),(1, 82),(1, 83),(1, 84),(1, 85),(1, 86),(1, 87),(1, 88),(1, 89),(1, 90),(1, 91),(1, 92),(1, 93),(1, 94); |
