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

2 files changed, 5 insertions, 2 deletions

diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
index 064ca60..d910707 100644
--- a/application/modules/user/controllers/GroupController.php
+++ b/application/modules/user/controllers/GroupController.php
@@ -147,9 +147,12 @@ class User_GroupController extends Zend_Controller_Action
 			if(isset($members)) {
 				foreach($members as $member) {
 					$person = $this->personmapper->find($member['personID']);
+					$membership_tmp = $this->membershipMapper->find($member['membershipID']);
+					$role = $this->rolemapper->find($membership_tmp->getRoleID());
 					$membersList[] = array(
 					'membershipID' => $member['membershipID'],
-					'person' => $person
+					'person' => $person,
+					'role' => $role
 					);
 				}
 				if(is_array($membersList)) {
diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
index 71a8c7d..c1e76d3 100644
--- a/application/modules/user/controllers/PersonController.php
+++ b/application/modules/user/controllers/PersonController.php
@@ -52,7 +52,7 @@ class user_PersonController extends Zend_Controller_Action
 		$this->view->person = $this->person;
 		// Pagination
 		$pagination = new Pbs_Pagination();
-		$pagination->setPerPage(1);
+		$pagination->setPerPage(3);
 		$pagination->setElement($this->groups);
 		$pagination->setRequestPage($this->_request->getParam('page'));
 		$pagination->setPageUrl('/user/person/index' .((isset($this->view->search))?'/search/'.$this->view->search:''));