Skip to content

Riina Antikainen / Moya

Go to a project
Commit 44b77763 by Tuomas Riihimäki
Options

Quickfix to use rowCount instead of empty for ListDataModel

1 parent 89c54ec5
Inline Side-by-side
Showing with 14 additions and 16 deletions
code/moya-web/WebContent/place/myGroups.xhtml
<!DOCTYPE html <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "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" <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:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui"> xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
<h:body> <h:body>
<ui:composition template="#{sessionHandler.template}"> <ui:composition template="#{sessionHandler.template}">
<ui:param name="thispage" value="page.place.mygroups" /> <ui:param name="thispage" value="page.place.mygroups" />
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<h:outputText rendered="#{empty placeGroupView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" /> <h:outputText rendered="#{placeGroupView.groupMemberships.rowCount == 0}" value="#{i18n['placegroupview.noMemberships']}" />
<h:form rendered="#{!empty placeGroupView.groupMemberships}" id="placelistform" styleClass="moya_datatable2"> <h:form rendered="#{placeGroupView.groupMemberships.rowCount > 0}" id="placelistform" styleClass="moya_datatable2">
<p:dataTable value="#{placeGroupView.groupMemberships}" var="member" id="placestable"> <p:dataTable value="#{placeGroupView.groupMemberships}" var="member" id="placestable">
...@@ -60,11 +60,11 @@ ...@@ -60,11 +60,11 @@
<h:commandButton rendered="#{placeGroupView.currentReleaseAllowed}" action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" /> <h:commandButton rendered="#{placeGroupView.currentReleaseAllowed}" action="#{placeGroupView.releasePlace()}" value="#{i18n['placegroupview.releasePlace']}" />
<p:inputText id="inviteEmail" immediate="true" rendered="#{placeGroupView.canSendInviteCurrent}" value="#{placeGroupView.inviteMail}" /> <p:inputText id="inviteEmail" immediate="true" rendered="#{placeGroupView.canSendInviteCurrent}" value="#{placeGroupView.inviteMail}" />
<p:commandButton rendered="#{placeGroupView.canSendInviteCurrent}" value="#{i18n['place.send']}" actionListener="#{placeGroupView.sendInvite}" update=":messages placestable" /> <p:commandButton rendered="#{placeGroupView.canSendInviteCurrent}" value="#{i18n['place.send']}" actionListener="#{placeGroupView.sendInvite}" update=":messages placestable" />
<p:watermark for="inviteEmail" rendered="#{placeGroupView.canSendInviteCurrent}" value="#{i18n['user.email']}" id="inviteEmailWatermark" /> <p:watermark for="inviteEmail" rendered="#{placeGroupView.canSendInviteCurrent}" value="#{i18n['user.email']}" id="inviteEmailWatermark" />
<h:outputText rendered="#{placeGroupView.showCancelInviteCurrent}" value="#{member.inviteEmail}" />&nbsp;&nbsp; <h:outputText rendered="#{placeGroupView.showCancelInviteCurrent}" value="#{member.inviteEmail}" />&nbsp;&nbsp;
<p:commandButton rendered="#{placeGroupView.showCancelInviteCurrent}" value="#{i18n['place.cancelSend']}" actionListener="#{placeGroupView.cancelInvite}" update=":messages placestable" /> <p:commandButton rendered="#{placeGroupView.showCancelInviteCurrent}" value="#{i18n['place.cancelSend']}" actionListener="#{placeGroupView.cancelInvite}" update=":messages placestable" />
</p:column> </p:column>
...@@ -74,20 +74,18 @@ ...@@ -74,20 +74,18 @@
</h:form> </h:form>
<!-- TODO: button --> <!-- TODO: button -->
<p:outputPanel rendered="#{!placeGroupView.useEticket and !empty placeGroupView.groupMemberships}" > <p:outputPanel rendered="#{!placeGroupView.useEticket and placeGroupView.groupMemberships.rowCount > 0}">
<p> <p>
<input type="button" onclick="location.replace('#{request.contextPath}/PlaceGroupPdf');" value="#{i18n['placegroup.printPdf']}" /> <input type="button" onclick="location.replace('#{request.contextPath}/PlaceGroupPdf');" value="#{i18n['placegroup.printPdf']}" />
</p> </p>
</p:outputPanel> </p:outputPanel>
<p:outputPanel rendered="#{!placeGroupView.useEticket and empty placeGroupView.groupMemberships}" > <p:outputPanel rendered="#{!placeGroupView.useEticket and placeGroupView.groupMemberships.rowCount == 0}">
<p> <p>#{i18n['placegroup.noPlacegroups']}</p>
#{i18n['placegroup.noPlacegroups']}
</p>
</p:outputPanel> </p:outputPanel>
<p:outputPanel rendered="#{placeGroupView.useEticket}" > <p:outputPanel rendered="#{placeGroupView.useEticket}">
<p> <p>
<p:button outcome="/place/myEtickets" value="#{i18n['placegroup.showEticket']}" /> <p:button outcome="/place/myEtickets" value="#{i18n['placegroup.showEticket']}" />
</p> </p>
...@@ -98,9 +96,9 @@ ...@@ -98,9 +96,9 @@
<p>#{i18n['placetoken.topText']}</p> <p>#{i18n['placetoken.topText']}</p>
<h:form id="placeTokenForm"> <h:form id="placeTokenForm">
<h:outputLabel value="#{i18n['placetoken.token']}:" /> <h:outputLabel value="#{i18n['placetoken.token']}:" />
<h:inputText value="#{tokenView.token}" /> <h:inputText value="#{tokenView.token}" />
<h:commandButton id="commitbtn" action="#{tokenView.saveToken()}" value="#{i18n['placetoken.commit']}" /> <h:commandButton id="commitbtn" action="#{tokenView.saveToken()}" value="#{i18n['placetoken.commit']}" />
</h:form> </h:form>
</p:outputPanel> </p:outputPanel>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!