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

1 files changed, 17 insertions, 5 deletions

diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index b99c1f8..408dcc4 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -31,11 +31,21 @@ if($this->roleID) {
 </table>
 <br />
 <h2>Rights:</h2>
-	<?php echo $this->formButton('linkright', 'Add Right', array(
+	<?php
+	if($this->rightsAvailable === true) {
+		echo $this->formButton('linkright', 'Add Right', array(
 							'onclick' => 'self.location="/user/role/linkright/roleID/' . $this->role->getID() .'"',
 							'class' => 'addbutton'))?>
+<br />
+		<?php
+	}
+	?>
 	<?php if(isset($this->rightsList)) {
-		?>
+		if(isset($this->rightcategorieslist)) {
+			foreach($this->rightcategorieslist as $k => $v) {
+				$rights = $this->rightsList[$k];
+				?>
+<h3><?php echo $v; ?></h3>
 <table>
 	<tr>
 		<th>Title</th>
@@ -44,7 +54,7 @@ if($this->roleID) {
 	</tr>
 
 	<?php
-	foreach($this->rightsList as $right) {
+	foreach($rights as $right) {
 		?>
 	<tr class="entry">
 		<td><?php echo $right->getTitle(); ?></td>
@@ -66,12 +76,14 @@ if($this->roleID) {
 	?>
 </table>
 	<?php
+			}
+		}
 	} else {
 		?>
 <br />
 <center>
 <h3>No Rights have been added!</h3>
 </center>
-		<?php
-	}
+<?php
+}
 }
\ No newline at end of file