diff options
| -rw-r--r-- | application/models/GroupGroupsMapper.php | 14 | ||||
| -rw-r--r-- | application/modules/user/controllers/IndexController.php | 2 | ||||
| -rw-r--r-- | pbs-newdata.sql | 6 | ||||
| -rw-r--r-- | pbs.sql | 8 |
4 files changed, 14 insertions, 16 deletions
diff --git a/application/models/GroupGroupsMapper.php b/application/models/GroupGroupsMapper.php index e0d3bec..f19ff02 100644 --- a/application/models/GroupGroupsMapper.php +++ b/application/models/GroupGroupsMapper.php @@ -88,15 +88,15 @@ class Application_Model_GroupGroupsMapper return $entries; } // Gets All groupIDs of the parent groups begins with the - public function getParentGroups($groupID, &$data=null, $level=1) { + public function getParentGroups($groupID, &$data=null, $level=0) { + + $data[$level][] = $groupID; + $db = Zend_Db_Table::getDefaultAdapter(); $query = 'SELECT parentID FROM pbs_groupgroups WHERE groupID="'.$groupID.'"'; $stmt = $db->query($query); $result = $stmt->fetchAll(); foreach($result as $row){ - // save the current groupID in level-list - $data[$level][] = $row['parentID']; - // get the function recursive an increase the level $data = $this->getParentGroups($row['parentID'], $data, $level+1); } @@ -104,15 +104,13 @@ class Application_Model_GroupGroupsMapper } // Gets all childs-groups from a given group - public function getChildGroups($groupID, &$data=null, $level=1) { + public function getChildGroups($groupID, &$data=null, $level=0) { + $data[$level][] = $groupID; $db = Zend_Db_Table::getDefaultAdapter(); $query = 'SELECT groupID FROM pbs_groupgroups WHERE parentID="'.$groupID.'"'; $stmt = $db->query($query); $result = $stmt->fetchAll(); foreach($result as $row){ - // save the current groupID in level-list - $data[$level][] = $row['groupID']; - // get the function recursive an increase the level $data = $this->getChildGroups($row['groupID'], $data, $level+1); } diff --git a/application/modules/user/controllers/IndexController.php b/application/modules/user/controllers/IndexController.php index 8974286..ce5c994 100644 --- a/application/modules/user/controllers/IndexController.php +++ b/application/modules/user/controllers/IndexController.php @@ -22,7 +22,7 @@ class User_IndexController extends Zend_Controller_Action '/user/bootmenu' => 'Create your Bootmenu', ); $this->view->links = $links; - } + } } } diff --git a/pbs-newdata.sql b/pbs-newdata.sql index 01b1fcc..13061c9 100644 --- a/pbs-newdata.sql +++ b/pbs-newdata.sql @@ -13,7 +13,6 @@ INSERT INTO `pbs_person` (`personID`, `title`, `name`, `firstname`, `street`, `h -- Adding group INSERT INTO `pbs`.`pbs_group` (`groupID` ,`title` ,`description`)VALUES -(1, 'Group 1', 'First Group'), (2, 'Group 2', 'Second Group'), (3, 'Group 3', 'Third Group'), (4, 'Group 4', 'Fourth Group'), @@ -36,16 +35,13 @@ INSERT INTO `pbs`.`pbs_groupgroups` (`parentID`, `groupID`) VALUES (3, 10); -- Adding role -INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES (1, '1', 'Role 1-Group1', NULL, 0); + INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES (2, '1', 'Role 2-Group1', NULL, 0); INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES (3, '2', 'Role 1-Group2', NULL, 0); INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES (4, '2', 'Role 2-Group2', NULL, 0); INSERT INTO `pbs_rightroles` (`roleID`, `rightID`) VALUES -(1, 1), -(1, 2), -(1, 3), (2, 4), (2, 3), (3, 1), @@ -547,5 +547,9 @@ INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title` -- FilterEinträge löschen (NULL, '11', 'ffd', 'Delete Filterentry of a Filter', NULL); - - +-- Adding Super-User +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); |