summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers/GroupController.php
diff options
context:
space:
mode:
authormichael pereira2011-04-07 14:45:51 +0200
committermichael pereira2011-04-07 14:45:51 +0200
commit6af094f483774692b0d9178b917abc04fa50d446 (patch)
tree27ba087e16d6fce71ebf499cf2e5a91771ef6f78 /application/modules/user/controllers/GroupController.php
parentMeta Recht geƤndert (diff)
parentfix der mapper in der fbgui (diff)
downloadpbs2-6af094f483774692b0d9178b917abc04fa50d446.tar.gz
pbs2-6af094f483774692b0d9178b917abc04fa50d446.tar.xz
pbs2-6af094f483774692b0d9178b917abc04fa50d446.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers/GroupController.php')
-rw-r--r--application/modules/user/controllers/GroupController.php5
1 files changed, 4 insertions, 1 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)) {