Ticket #192 - Inheritance ist nun auch berücksichtigt Group Controller fertig

1 files changed, 10 insertions, 6 deletions

diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index c8363cd..386c782 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -66,7 +66,7 @@ foreach($this->groupRequestList as $grouprequest) {
 			?>
 		<div class='actions'><?php if(Pbs_Acl::checkRight('gam')): ?>
 			<form action="/user/group/grantperson" method="post">
-				<input	type="hidden" name="grouprequestID" value="<?php echo $grouprequestID; ?>" /> <?php printRoleSelect($this->roleList); ?>
+				<input	type="hidden" name="grouprequestID" value="<?php echo $grouprequestID; ?>" />Role:<?php printRoleSelect($this->roleList); ?>
 				<input type="image" src='/media/img/save.png' alt='Grant Person' name="confirm" value="confirm" /> <?php endif; ?> <?php if(Pbs_Acl::checkRight('gdm')): ?>
 				<a href="<?php echo $this->url(
 						array(
@@ -193,12 +193,16 @@ if((Pbs_Acl::checkRight('gdmo') && $this->usergroup == $this->requestgroup) || (
 }
 
 function printRoleSelect($roleList) {
-	if(!is_array($roleList)) {
-		return;
-	}
+	$s = '';
+	#print_a($roleList);
 	echo "<select name=\"roleID\">";
-	foreach($roleList as $role) {
-		echo "<option value=\"" . $role['roleID'] . "\">" . $role['title'] . "</option>";
+	foreach($roleList as $grouptitle=>$head) {
+		#print_a($grouptitle,$head);
+		echo "<optgroup label='".$grouptitle."'>";
+		foreach($head as $role){		
+			echo "<option value=\"" . $role->getID() . "\">" . $role->getTitle() . "</option>";
+		}
+		echo "</optgroup>";
 	}
 	echo "</select>";
 }