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

3 files changed, 88 insertions, 13 deletions

diff --git a/application/modules/user/views/scripts/person/owndetails.phtml b/application/modules/user/views/scripts/person/owndetails.phtml
index 8f91cfd..ac96d25 100644
--- a/application/modules/user/views/scripts/person/owndetails.phtml
+++ b/application/modules/user/views/scripts/person/owndetails.phtml
@@ -105,4 +105,43 @@ $class= 'highlight checked';
 </div>
 							<?php endforeach ?></div>
 							<?php echo $this->pagination;
+							if(isset($this->groupRequestList)) {
+								?>
+<br />
+<h2>Requests:</h2>
+<div class='listelement'><?php
+foreach($this->groupRequestList as $grouprequest) {
+	$grouprequestID = $grouprequest['grouprequestID'];
+	$group = $grouprequest['group'];
+	?>
+<div class='element'>
+<div class='content'>
+<div class='actions'><a
+	href="<?php echo $this->url(
+							array(
+								'module'	=> 'user',
+								'controller' => 'person',
+								'action'     => 'deleterequest',
+								'grouprequestID'   =>  $grouprequestID
+							),
+							'default',
+							true) ?>"> <img src='/media/img/delete.png' alt='Delete Request' /></a>
+</div>
+<div class='title'><?php echo $group->getTitle(); ?></div>
+							<?php if($group->getDescription()) {
+								?>
+<div class='subtitle'><?php echo $group->getDescription(); ?></div>
+								<?php
+							} else {
+								?>
+<div class='subtitle'>&nbsp;</div>
+								<?php
+							}
+							?></div>
+</div>
+							<?php
+}
+?></div>
+<?php
+							}
 							?>
\ No newline at end of file
diff --git a/application/modules/user/views/scripts/person/show.phtml b/application/modules/user/views/scripts/person/show.phtml
index 5fb4bde..c43bde3 100644
--- a/application/modules/user/views/scripts/person/show.phtml
+++ b/application/modules/user/views/scripts/person/show.phtml
@@ -93,4 +93,32 @@ $class= 'highlight checked';
 </div>
 <?php endforeach ?></div>
 <?php echo $this->pagination;
+if(isset($this->groupRequestList)) {
+	?>
+<br />
+<h2>Requests:</h2>
+<div class='listelement'><?php
+foreach($this->groupRequestList as $grouprequest) {
+	$grouprequestID = $grouprequest['grouprequestID'];
+	$group = $grouprequest['group'];
+	?>
+<div class='element'>
+<div class='content'>
+<div class='title'><?php echo $group->getTitle(); ?></div>
+							<?php if($group->getDescription()) {
+								?>
+<div class='subtitle'><?php echo $group->getDescription(); ?></div>
+								<?php
+							} else {
+								?>
+<div class='subtitle'>&nbsp;</div>
+								<?php
+							}
+							?></div>
+</div>
+							<?php
+}
+?></div>
+<?php
+}
 ?>
\ No newline at end of file
diff --git a/application/modules/user/views/scripts/role/show.phtml b/application/modules/user/views/scripts/role/show.phtml
index 8f4bb50..8c7503f 100644
--- a/application/modules/user/views/scripts/role/show.phtml
+++ b/application/modules/user/views/scripts/role/show.phtml
@@ -53,17 +53,22 @@ if($this->rightsAvailable === true) {
 		echo $this->formButton('linkright', 'Add Rights', array(
 							'onclick' => 'self.location="/user/role/linkright/roleID/' . $this->role->getID() .'"',
 							'class' => 'addbutton'))?>
-<br />
 		<?php
 	}
 }
-if(count($this->rightsList)==0)
-echo "There are no Rights to display.";
-if(isset($this->rightcategorieslist)) {
-	foreach($this->rightcategorieslist as $k => $v):
-	$rights = $this->rightsList[$k];
-	if(count($rights) > 0) {
-		?>
+if(count($this->rightsList)==0) {
+	echo "There are no Rights to display.";
+} else {
+	if($this->removeRightOfRoleRight) echo $this->formButton('deleteallrights', 'Delete All Rights', array(
+							'onclick' => 'self.location="/user/role/unlinkright/rightrolesID/' .  $this->roleID . '-all"',
+							'class' => 'rightbutton'));?>
+<br />
+	<?php
+	if(isset($this->rightcategorieslist)) {
+		foreach($this->rightcategorieslist as $k => $v):
+		$rights = $this->rightsList[$k];
+		if(count($rights) > 0) {
+			?>
 <h3><?php echo $v; ?>:</h3>
 <div class='listelement'><?php
 foreach($rights as $right):
@@ -96,12 +101,15 @@ if($right->getDescription()) {
 <div class='clear'></div>
 </div>
 <?php
-endforeach;
-	}
-	?></div>
+endforeach
+?></div>
+<?php
+		}
+		?>
 <br />
-	<?php
-	endforeach;
+		<?php
+		endforeach;
+	}
 }
 }
 ?>