Add links to users and places from users placeslotlist

Tuomas Riihimäki
Commit d2f887ff authored Feb 05, 2016 by Tuomas Riihimäki
Showing with 18 additions and 11 deletions
code/moya-web/WebContent/place/adminGroups.xhtml
--- a/code/moya-web/WebContent/place/adminGroups.xhtml
+++ b/code/moya-web/WebContent/place/adminGroups.xhtml
 <!DOCTYPE html 
     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
 	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.place.mygroups" />
@@ -28,26 +28,31 @@
 						<f:facet name="header">
 							<h:outputText value="#{i18n['placegroupview.reservationName']}" />
 						</f:facet>
-						<h:outputText value="#{member.placeReservation.name}" />
+						<h:link value="#{member.placeReservation.name}" outcome="/place/edit">
+							<f:param name="placeid" value="#{member.placeReservation.id}" />
+						</h:link>
 					</h:column>
 					<h:column>
 						<f:facet name="header">
 							<h:outputText value="#{i18n['placegroupview.token']}" />
 						</f:facet>
 						<h:outputText rendered="#{empty member.user}" value="#{member.inviteToken}" />
-						<h:outputText rendered="#{!empty member.user}" value="#{member.user.firstnames} #{member.user.lastname} (#{member.user.nick})" />
-
+						<h:link rendered="#{!empty member.user}" value="#{member.user.firstnames} #{member.user.lastname} (#{member.user.nick})" outcome="/place/adminGroups">
+							<f:param name="userid" value="#{member.user.user.id}" />
+						</h:link>
 					</h:column>
 					<h:column>
 						<f:facet name="header">
 							<h:outputText value="#{i18n['placegroupview.groupCreator']}" />
 						</f:facet>
-						<h:outputText value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" />
-
+						<h:link value="#{member.placeGroup.creator.firstnames} #{member.placeGroup.creator.lastname} (#{member.placeGroup.creator.nick})" outcome="/place/adminGroups">
+							<f:param name="userid" value="#{member.placeGroup.creator.user.id}" />
+						</h:link>
 					</h:column>

 					<h:column>
-						<h:commandButton rendered="#{placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull}" action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" />
+						<h:commandButton rendered="#{placeGroupView.canModifyCurrent and placeGroupView.currentMemberUserNotNull}" action="#{placeGroupView.releasePlace()}"
+							value="#{i18n['placegroupview.releasePlace']}" />
 					</h:column>

 				</h:dataTable>
@@ -66,7 +71,7 @@

 			<h2>Place slots</h2>
 			<h:form>
-				
+
 				<p:dataTable var="slot" value="#{placeGroupView.placeslots}" id="placeslots">
 					<p:column headerText="#{i18n['placeslot.id']}">
 						<h:outputText value="#{slot.id}" />
@@ -78,7 +83,9 @@
 						<h:outputText value="#{slot.product.name}" />
 					</p:column>
 					<p:column headerText="#{i18n['placeslot.place']}">
-						<h:outputText rendered="#{!empty slot.place}" value="#{slot.place.name}" />
+						<h:link value="#{slot.place.name}" rendered="#{!empty slot.place}" outcome="/place/edit">
+							<f:param name="placeid" value="#{slot.place.id}" />
+						</h:link>
 					</p:column>
 					<p:column headerText="#{i18n['placeslot.used']}">
 						<h:outputText value="#{slot.used}">
@@ -90,7 +97,7 @@
 							<f:param name="billid" value="#{slot.bill.id}" />
 						</h:link>
 					</p:column>
-					<p:column >
+					<p:column>
 						<p:commandButton rendered="#{empty slot.place and empty slot.used}" value="#{i18n['placeslot.lockSlot']}" actionListener="#{placeGroupView.lockSlot}" update="placeslots" />
 						<p:commandButton rendered="#{empty slot.place and not empty slot.used}" value="#{i18n['placeslot.releaseSlot']}" actionListener="#{placeGroupView.releaseSlot}" update="placeslots" />
 					</p:column>