Skip to content

Max Mecklin / Moya

Go to a project
Commit db1ef059 by Tuomas Riihimäki
Options

Merge branch 'silentajax' into 'master' 

Silent ajax fail fix.

Korjaa hiljaiset ajaxfailaukset esim session timeoutissa.

Korjaa ainakin suurimman osan issuesta #3
2 parents 20ceaf74 96b05c29
Inline Side-by-side
Showing with 58 additions and 58 deletions
code/MoyaWeb/WebContent/bill/showBill.xhtml
...@@ -61,12 +61,12 @@ ...@@ -61,12 +61,12 @@
<ui:fragment rendered="#{!billEditView.bill.paid and !billEditView.bill.expired}"> <ui:fragment rendered="#{!billEditView.bill.paid and !billEditView.bill.expired}">
<h:form> <h:form>
<p:commandButton id="cancelbtn" onclick="PF('confirmation').show()" value="#{i18n['bill.cancel']}" /> <p:commandButton id="cancelbtn" onclick="PF('confirmation').show()" onerror="location.reload(true);" value="#{i18n['bill.cancel']}" />
<p:confirmDialog id="confirmDialog" message="#{i18n['generic.sure.message']}" header="#{i18n['generic.sure.header']}" severity="alert" widgetVar="confirmation"> <p:confirmDialog id="confirmDialog" message="#{i18n['generic.sure.message']}" header="#{i18n['generic.sure.header']}" severity="alert" widgetVar="confirmation">
<p:commandButton value="#{i18n['generic.sure.yes']}" onclick="PF('confirmation').hide()" actionListener="#{billEditView.expireBill()}" ajax="false" /> <p:commandButton value="#{i18n['generic.sure.yes']}" onerror="location.reload(true);" onclick="PF('confirmation').hide()" actionListener="#{billEditView.expireBill()}" ajax="false" />
<p:commandButton value="#{i18n['generic.sure.no']}" onclick="PF('confirmation').hide()" type="button" /> <p:commandButton value="#{i18n['generic.sure.no']}" onerror="location.reload(true);" onclick="PF('confirmation').hide()" type="button" />
</p:confirmDialog> </p:confirmDialog>
</h:form> </h:form>
......
code/MoyaWeb/WebContent/card/massprint.xhtml
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<p:fileDownload value="#{cardMassPrintView.streamedFile}" /> <p:fileDownload value="#{cardMassPrintView.streamedFile}" />
</p:commandButton> </p:commandButton>
<p:commandButton value="Accept printout" action="#{cardMassPrintView.acceptPrintout()}" rendered="#{cardMassPrintView.waitForAcceptance}" /> <p:commandButton onerror="location.reload(true);" value="Accept printout" action="#{cardMassPrintView.acceptPrintout()}" rendered="#{cardMassPrintView.waitForAcceptance}" />
</h:form> </h:form>
<h:outputText value="Error generating mass output!" rendered="#{empty cardMassPrintView.streamedFile}"/> <h:outputText value="Error generating mass output!" rendered="#{empty cardMassPrintView.streamedFile}"/>
......
code/MoyaWeb/WebContent/license/manageCodes.xhtml
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="edit" /> <h:outputText value="edit" />
</f:facet> </f:facet>
<p:commandButton value="muokkaa" update=":editgame" > <p:commandButton onerror="location.reload(true);" value="muokkaa" update=":editgame" >
<f:setPropertyActionListener value="#{license}" target="#{licenseView.currentLicense}" /> <f:setPropertyActionListener value="#{license}" target="#{licenseView.currentLicense}" />
</p:commandButton> </p:commandButton>
</p:column> </p:column>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<p:commandButton action="#{licenseView.saveCurrentLicense}" update=":licenseForm" value="#{i18n['license.save']}" /> <p:commandButton onerror="location.reload(true);" action="#{licenseView.saveCurrentLicense}" update=":licenseForm" value="#{i18n['license.save']}" />
</p:panelGrid> </p:panelGrid>
</h:form> </h:form>
......
code/MoyaWeb/WebContent/resources/cditools/products/shop.xhtml
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</h:panelGrid> </h:panelGrid>
<br /> <br />
<p:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" /> <p:commandButton onerror="location.reload(true);" action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" />
......
code/MoyaWeb/WebContent/resources/cditools/reader/readerlisttiles.xhtml
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</h:column> </h:column>
<h:column> <h:column>
<p:commandButton ajax="false" action="#{readerView.setReaderToId(rr.id)}" value="#{i18n['reader.select']}" /> <p:commandButton onerror="location.reload(true);" ajax="false" action="#{readerView.setReaderToId(rr.id)}" value="#{i18n['reader.select']}" />
</h:column> </h:column>
</h:dataTable> </h:dataTable>
......
code/MoyaWeb/WebContent/resources/cditools/role/form.xhtml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
xmlns:composite="http://java.sun.com/jsf/composite" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:composite="http://java.sun.com/jsf/composite" xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools"> xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:p="http://primefaces.org/ui">
<ui:composition> <ui:composition>
......
code/MoyaWeb/WebContent/resources/cditools/shop/shoppingcart.xhtml
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['shop.actions']}" /> <h:outputText value="#{i18n['shop.actions']}" />
</f:facet> </f:facet>
<p:commandButton action="#{productShopView.removeBought()}" update="@form" value="Poista" /> <p:commandButton action="#{productShopView.removeBought()}" update="@form" onerror="location.reload(true);" value="Poista" />
</p:column> </p:column>
</p:dataTable> </p:dataTable>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
</h:inputText> </h:inputText>
</h:panelGrid> </h:panelGrid>
<p:commandButton update="@form" action="#{productShopView.buyByCredit()}" value="#{i18n['shop.buyByCredit']}" /> <p:commandButton update="@form" onerror="location.reload(true);" action="#{productShopView.buyByCredit()}" value="#{i18n['shop.buyByCredit']}" />
<h:panelGrid columns="2" style="background-color: #{productShopView.balanceAfterTransaction lt 0?'lightcoral':'lightgreen'}"> <h:panelGrid columns="2" style="background-color: #{productShopView.balanceAfterTransaction lt 0?'lightcoral':'lightgreen'}">
......
code/MoyaWeb/WebContent/resources/cditools/user/create.xhtml
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
<p:overlayPanel id="chartPanel" for="webcamButton" hideEffect="fade"> <p:overlayPanel id="chartPanel" for="webcamButton" hideEffect="fade">
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" /> <p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" />
<p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" /> <p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);" />
</p:overlayPanel> </p:overlayPanel>
<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" /> <h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
...@@ -38,14 +38,14 @@ ...@@ -38,14 +38,14 @@
<img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" /> <img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
</ui:fragment> </ui:fragment>
<br /> <br />
<p:commandButton id="webcamButton" value="#{i18n['userimage.webcam']}" type="button" /> <p:commandButton id="webcamButton" value="#{i18n['userimage.webcam']}" onerror="location.reload(true);" type="button" />
<br /> <br />
<br /> <br />
<p:fileUpload id="uploadfile" required="TRUE" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" value="#{userView.image}" mode="simple" /> <p:fileUpload id="uploadfile" required="TRUE" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" value="#{userView.image}" mode="simple" />
<p:message for="uploadfile" /> <p:message for="uploadfile" />
<p:commandButton action="#{userView.sendImage}" value="#{i18n['user.imagesubmit']}" /> <p:commandButton action="#{userView.sendImage}" onerror="location.reload(true);" value="#{i18n['user.imagesubmit']}" />
</ui:fragment> </ui:fragment>
</h:panelGroup> </h:panelGroup>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<br /> <br />
<p:commandButton ajax="false" rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}" /> <p:commandButton ajax="false" rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}" onerror="location.reload(true);"/>
</h:panelGroup> </h:panelGroup>
......
code/MoyaWeb/WebContent/resources/cditools/user/edit.xhtml
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<ui:fragment rendered="#{not empty userView.user.id}"> <ui:fragment rendered="#{not empty userView.user.id}">
<p:dialog id="chartPanel" for="webcamButton" modal="true" dynamic="true" widgetVar="webcamDialog"> <p:dialog id="chartPanel" for="webcamButton" modal="true" dynamic="true" widgetVar="webcamDialog">
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" /> <p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" />
<p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" /> <p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);"/>
</p:dialog> </p:dialog>
...@@ -33,21 +33,21 @@ ...@@ -33,21 +33,21 @@
<img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" /> <img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
</ui:fragment> </ui:fragment>
<br /> <br />
<p:commandButton rendered="#{!cc.attrs.camAlwaysOn}" id="webcamButton" value="#{i18n['userimage.webcam']}" onclick="PF('webcamDialog').show()" type="button" /> <p:commandButton onerror="location.reload(true);" rendered="#{!cc.attrs.camAlwaysOn}" id="webcamButton" value="#{i18n['userimage.webcam']}" onclick="PF('webcamDialog').show()" type="button" />
<br /> <br />
<br /> <br />
<ui:fragment rendered="#{cc.attrs.camAlwaysOn}"> <ui:fragment rendered="#{cc.attrs.camAlwaysOn}">
photoupdate: #{cc.attrs.photocamupdate} photoupdate: #{cc.attrs.photocamupdate}
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="#{cc.attrs.photocamupdate}" /> <p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="#{cc.attrs.photocamupdate}" />
<p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" /> <p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);" />
</ui:fragment> </ui:fragment>
<!-- --> <!-- -->
&nbsp; &nbsp;
<p:fileUpload id="uploadfile" value="#{userView.image}" mode="simple" required="true" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" /> <p:fileUpload id="uploadfile" value="#{userView.image}" mode="simple" required="true" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" />
<p:message for="uploadfile" /> <p:message for="uploadfile" />
<p:commandButton action="#{userView.sendImage}" ajax="false" value="#{i18n['user.imagesubmit']}" /> <p:commandButton action="#{userView.sendImage}" ajax="false" value="#{i18n['user.imagesubmit']}" onerror="location.reload(true);" />
</ui:fragment> </ui:fragment>
<ui:fragment rendered="#{cc.attrs.creating}"> <ui:fragment rendered="#{cc.attrs.creating}">
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
</table> </table>
<p:commandButton rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" ajax="false" value="#{cc.attrs.commitvalue}" /> <p:commandButton rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" ajax="false" value="#{cc.attrs.commitvalue}" onerror="location.reload(true);"/>
</h:panelGroup> </h:panelGroup>
</h:form> </h:form>
......
code/MoyaWeb/WebContent/resources/cditools/user/newedit.xhtml
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<p:overlayPanel id="chartPanel" for="webcamButton" hideEffect="fade"> <p:overlayPanel id="chartPanel" for="webcamButton" hideEffect="fade">
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" /> <p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" />
<p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" /> <p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);" />
</p:overlayPanel> </p:overlayPanel>
<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" /> <h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
...@@ -38,14 +38,14 @@ ...@@ -38,14 +38,14 @@
<img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" /> <img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.img" alt="image" />
</ui:fragment> </ui:fragment>
<br /> <br />
<p:commandButton id="webcamButton" value="#{i18n['userimage.webcam']}" type="button" /> <p:commandButton id="webcamButton" value="#{i18n['userimage.webcam']}" type="button" onerror="location.reload(true);"/>
<br /> <br />
<br /> <br />
<p:fileUpload id="uploadfile" required="TRUE" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" value="#{userView.image}" mode="simple" /> <p:fileUpload id="uploadfile" required="TRUE" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" value="#{userView.image}" mode="simple" />
<p:message for="uploadfile" /> <p:message for="uploadfile" />
<p:commandButton action="#{userView.sendImage}" value="#{i18n['user.imagesubmit']}" /> <p:commandButton action="#{userView.sendImage}" value="#{i18n['user.imagesubmit']}" onerror="location.reload(true);"/>
</ui:fragment> </ui:fragment>
<ui:fragment rendered="#{cc.attrs.creating}"> <ui:fragment rendered="#{cc.attrs.creating}">
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
</table> </table>
<p:commandButton rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}" /> <p:commandButton rendered="#{cc.attrs.creating or userView.canSave}" id="commitbtn" action="#{cc.attrs.commitaction}" value="#{cc.attrs.commitvalue}" onerror="location.reload(true);" />
</h:panelGroup> </h:panelGroup>
......
code/MoyaWeb/WebContent/resources/cditools/user/previewAndPrintCard.xhtml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div> <div>
<p:graphicImage url="/dydata/usercard/#{userView.user.user.id}.png" width="300" /><br /> <p:graphicImage url="/dydata/usercard/#{userView.user.user.id}.png" width="300" /><br />
<p:commandButton action="#{userView.prepareCardDownload()}" rendered="#{userView.waitForAcceptance==false}" value="print card" ajax="true" update="@form" onclick="PrimeFaces.monitorDownload(start, stop)"> <p:commandButton action="#{userView.prepareCardDownload()}" onerror="location.reload(true);" rendered="#{userView.waitForAcceptance==false}" value="print card" ajax="true" update="@form" onclick="PrimeFaces.monitorDownload(start, stop)">
<p:fileDownload value="#{userView.streamedFile}" /> <p:fileDownload value="#{userView.streamedFile}" />
</p:commandButton> </p:commandButton>
</div> </div>
......
code/MoyaWeb/WebContent/tournaments/admin/createwizard.xhtml
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<br /> <br />
</p:panel> </p:panel>
<div style="float: right;"> <div style="float: right;">
<p:commandButton icon="apply" value="#{i18n['tournaments.admin.create_tournament']}" action="#{tournamentCreateView.save}"/> <p:commandButton icon="apply" value="#{i18n['tournaments.admin.create_tournament']}" action="#{tournamentCreateView.save}" onerror="location.reload(true);"/>
</div> </div>
</p:tab> </p:tab>
</p:wizard> </p:wizard>
......
code/MoyaWeb/WebContent/tournaments/admin/delete.xhtml
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<h1>#{i18n['tournaments.admin.remove_title']}</h1> <h1>#{i18n['tournaments.admin.remove_title']}</h1>
<p>#{i18n['tournaments.admin.remove_confirmation_text']}</p> <p>#{i18n['tournaments.admin.remove_confirmation_text']}</p>
<h:form> <h:form>
<p:commandButton value="#{i18n['tournament.admin.delete_cancel']}" action="#{tournamentDeleteView.cancel}" /> <p:commandButton value="#{i18n['tournament.admin.delete_cancel']}" action="#{tournamentDeleteView.cancel}" onerror="location.reload(true);"/>
<p:commandButton value="#{i18n['tournament.admin.delete_confirm']}" action="#{tournamentDeleteView.delete}" /> <p:commandButton value="#{i18n['tournament.admin.delete_confirm']}" action="#{tournamentDeleteView.delete}" onerror="location.reload(true);"/>
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/MoyaWeb/WebContent/tournaments/admin/edit.xhtml
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
<p:calendar stepHour="1" stepMinute="10" pattern="dd.MM.yyyy HH:mm" value="#{tournamentEditView.tournament.beginsAt}"/> <p:calendar stepHour="1" stepMinute="10" pattern="dd.MM.yyyy HH:mm" value="#{tournamentEditView.tournament.beginsAt}"/>
</h:panelGrid> </h:panelGrid>
<p:commandButton value="#{i18n['tournaments.admin.cancel_edits']}" action="#{tournamentEditView.cancel}" ajax="false" /> <p:commandButton value="#{i18n['tournaments.admin.cancel_edits']}" action="#{tournamentEditView.cancel}" ajax="false" onerror="location.reload(true);"/>
<p:commandButton value="#{i18n['tournaments.admin.edit_tournament']}" action="#{tournamentEditView.commit}" ajax="false" /> <p:commandButton value="#{i18n['tournaments.admin.edit_tournament']}" action="#{tournamentEditView.commit}" ajax="false" onerror="location.reload(true);"/>
</h:form> </h:form>
</ui:define> </ui:define>
......
code/MoyaWeb/WebContent/tournaments/admin/index.xhtml
...@@ -72,15 +72,15 @@ ...@@ -72,15 +72,15 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['tournament.admin.control']}" /> <h:outputText value="#{i18n['tournament.admin.control']}" />
</f:facet> </f:facet>
<p:commandButton value="#{i18n['tournament.admin.view']}" action="#{tournamentParticipantsView.showView(tournament.id)}"/> <p:commandButton value="#{i18n['tournament.admin.view']}" action="#{tournamentParticipantsView.showView(tournament.id)}" onerror="location.reload(true);"/>
<p:commandButton value="#{i18n['tournament.admin.edit']}" action="#{tournamentEditView.showEdit(tournament.id)}"/> <p:commandButton value="#{i18n['tournament.admin.edit']}" action="#{tournamentEditView.showEdit(tournament.id)}" onerror="location.reload(true);"/>
<p:commandButton value="#{i18n['tournament.admin.delete']}" action="#{tournamentDeleteView.showConfirm(tournament.id)}"/> <p:commandButton value="#{i18n['tournament.admin.delete']}" action="#{tournamentDeleteView.showConfirm(tournament.id)}" onerror="location.reload(true);"/>
</p:column> </p:column>
</p:dataTable> </p:dataTable>
</h:form> </h:form>
<h:form> <h:form>
<p:commandButton value="#{i18n['tournament.admin.create']}" action="#{tournamentAdminView.create}" /> <p:commandButton value="#{i18n['tournament.admin.create']}" action="#{tournamentAdminView.create}" onerror="location.reload(true);"/>
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/MoyaWeb/WebContent/tournaments/admin/view_tournament_single.xhtml
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<h:form> <h:form>
<p:commandButton value="#{i18n['tournament.admin.back_to_index']}" action="#{tournamentParticipantsView.cancel}" /> <p:commandButton value="#{i18n['tournament.admin.back_to_index']}" action="#{tournamentParticipantsView.cancel}" onerror="location.reload(true);"/>
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/MoyaWeb/WebContent/tournaments/admin/view_tournament_team.xhtml
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</h:form> </h:form>
<h:form> <h:form>
<p:commandButton value="#{i18n['tournament.admin.back_to_index']}" action="#{tournamentParticipantsView.cancel}" /> <p:commandButton value="#{i18n['tournament.admin.back_to_index']}" action="#{tournamentParticipantsView.cancel}" onerror="location.reload(true);"/>
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/MoyaWeb/WebContent/tournaments/index.xhtml
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</f:facet> </f:facet>
<h:panelGroup> <h:panelGroup>
<p:commandButton value="#{i18n['tournament.participate']}" action="#{tournamentParticipateView.participate(tournament.id)}" <p:commandButton value="#{i18n['tournament.participate']}" action="#{tournamentParticipateView.participate(tournament.id)}"
rendered="#{tournament.participants.size() lt tournament.maxParticipants}" ajax="false" /> rendered="#{tournament.participants.size() lt tournament.maxParticipants}" ajax="false" onerror="location.reload(true);"/>
<h:outputText value="#{i18n['tournament.full']}" rendered="#{tournament.participants.size() ge tournament.maxParticipants}" /> <h:outputText value="#{i18n['tournament.full']}" rendered="#{tournament.participants.size() ge tournament.maxParticipants}" />
</h:panelGroup> </h:panelGroup>
</p:column> </p:column>
......
code/MoyaWeb/WebContent/tournaments/participate_multi.xhtml
...@@ -34,14 +34,14 @@ ...@@ -34,14 +34,14 @@
<h:outputText value="#{i18n['tournament.control']}" /> <h:outputText value="#{i18n['tournament.control']}" />
</f:facet> </f:facet>
<h:panelGroup> <h:panelGroup>
<p:commandButton value="#{i18n['tournament.teammember.delete']}" action="#{tournamentParticipateView.removePlayerFromTeam(teamMember.eventUser.id)}" update="@form" /> <p:commandButton value="#{i18n['tournament.teammember.delete']}" action="#{tournamentParticipateView.removePlayerFromTeam(teamMember.eventUser.id)}" update="@form" onerror="location.reload(true);"/>
</h:panelGroup> </h:panelGroup>
</p:column> </p:column>
</p:dataTable> </p:dataTable>
<h:panelGrid columns="3" rendered="#{tournamentParticipateView.teamMax > tournamentParticipateView.playerCount}"> <h:panelGrid columns="3" rendered="#{tournamentParticipateView.teamMax > tournamentParticipateView.playerCount}">
<h:outputText value="#{i18n['tournament.teammember.login']}" /> <h:outputText value="#{i18n['tournament.teammember.login']}" />
<p:inputText value="#{tournamentParticipateView.selectedPlayerLogin}" /> <p:inputText value="#{tournamentParticipateView.selectedPlayerLogin}" />
<p:commandButton value="#{i18n['tournaments.add_player_to_team']}" action="#{tournamentParticipateView.addMainPlayerToTeam}" update="@form" /> <p:commandButton value="#{i18n['tournaments.add_player_to_team']}" action="#{tournamentParticipateView.addMainPlayerToTeam}" update="@form" onerror="location.reload(true);"/>
</h:panelGrid> </h:panelGrid>
<h:panelGroup rendered="#{tournamentParticipateView.backupMax > 0}"> <h:panelGroup rendered="#{tournamentParticipateView.backupMax > 0}">
...@@ -58,14 +58,14 @@ ...@@ -58,14 +58,14 @@
<h:outputText value="#{i18n['tournament.control']}" /> <h:outputText value="#{i18n['tournament.control']}" />
</f:facet> </f:facet>
<h:panelGroup> <h:panelGroup>
<p:commandButton value="#{i18n['tournament.teammember.delete']}" action="#{tournamentParticipateView.removePlayerFromTeam(teamMember.eventUser.id)}" update="@form" /> <p:commandButton value="#{i18n['tournament.teammember.delete']}" action="#{tournamentParticipateView.removePlayerFromTeam(teamMember.eventUser.id)}" update="@form" onerror="location.reload(true);"/>
</h:panelGroup> </h:panelGroup>
</p:column> </p:column>
</p:dataTable> </p:dataTable>
<h:panelGrid columns="3" rendered="#{tournamentParticipateView.backupMax > tournamentParticipateView.backupPlayerCount}"> <h:panelGrid columns="3" rendered="#{tournamentParticipateView.backupMax > tournamentParticipateView.backupPlayerCount}">
<h:outputText value="#{i18n['tournament.teammember.login']}" /> <h:outputText value="#{i18n['tournament.teammember.login']}" />
<p:inputText value="#{tournamentParticipateView.selectedBackupPlayerLogin}" /> <p:inputText value="#{tournamentParticipateView.selectedBackupPlayerLogin}" />
<p:commandButton value="#{i18n['tournaments.add_backup_player_to_team']}" action="#{tournamentParticipateView.addBackupPlayerToTeam}" update="@form" /> <p:commandButton value="#{i18n['tournaments.add_backup_player_to_team']}" action="#{tournamentParticipateView.addBackupPlayerToTeam}" update="@form" onerror="location.reload(true);"/>
</h:panelGrid> </h:panelGrid>
</h:panelGroup> </h:panelGroup>
...@@ -81,8 +81,8 @@ ...@@ -81,8 +81,8 @@
</h:panelGroup> </h:panelGroup>
</h:panelGrid> </h:panelGrid>
<p:commandButton value="#{i18n['tournaments.cancel_participation']}" action="#{tournamentParticipateView.cancelParticipation}" /> <p:commandButton value="#{i18n['tournaments.cancel_participation']}" action="#{tournamentParticipateView.cancelParticipation}" onerror="location.reload(true);"/>
<p:commandButton value="#{i18n['tournaments.accept_rules_and_participate']}" action="#{tournamentParticipateView.saveParticipation}" disabled="#{tournamentParticipateView.teamMax != tournamentParticipateView.playerCount}" /> <p:commandButton value="#{i18n['tournaments.accept_rules_and_participate']}" action="#{tournamentParticipateView.saveParticipation}" disabled="#{tournamentParticipateView.teamMax != tournamentParticipateView.playerCount}" onerror="location.reload(true);"/>
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/MoyaWeb/WebContent/tournaments/participate_single.xhtml
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<p><h:outputText value="#{tournamentParticipateView.tournament.rules.rules}" escape="false" /></p> <p><h:outputText value="#{tournamentParticipateView.tournament.rules.rules}" escape="false" /></p>
<h:form> <h:form>
<p:commandButton value="#{i18n['tournaments.cancel_participation']}" action="#{tournamentParticipateView.cancelParticipation}" /> <p:commandButton value="#{i18n['tournaments.cancel_participation']}" action="#{tournamentParticipateView.cancelParticipation}" onerror="location.reload(true);"/>
<p:commandButton value="#{i18n['tournaments.accept_rules_and_participate']}" action="#{tournamentParticipateView.saveParticipation}" /> <p:commandButton value="#{i18n['tournaments.accept_rules_and_participate']}" action="#{tournamentParticipateView.saveParticipation}" onerror="location.reload(true);"/>
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
code/MoyaWeb/WebContent/user/gameids.xhtml
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['user.game.manage']}" /> <h:outputText value="#{i18n['user.game.manage']}" />
</f:facet> </f:facet>
<p:commandButton value="#{i18n['user.game.remove_gameid']}" action="#{userGameIDView.removeGameID(gameid.id)}" ajax="false" /> <p:commandButton value="#{i18n['user.game.remove_gameid']}" action="#{userGameIDView.removeGameID(gameid.id)}" ajax="false" onerror="location.reload(true);"/>
</p:column> </p:column>
</p:dataTable> </p:dataTable>
<h:panelGroup rendered="#{not empty userGameIDView.games}"> <h:panelGroup rendered="#{not empty userGameIDView.games}">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<h:outputText value="#{i18n['tournament.participant_gameid']}" /> <h:outputText value="#{i18n['tournament.participant_gameid']}" />
<p:inputText value="#{userGameIDView.identifier}" /> <p:inputText value="#{userGameIDView.identifier}" />
<p:commandButton value="#{i18n['user.game.add_gameid']}" action="#{userGameIDView.addGameID}" ajax="false" /> <p:commandButton value="#{i18n['user.game.add_gameid']}" action="#{userGameIDView.addGameID}" ajax="false" onerror="location.reload(true);"/>
</h:panelGrid> </h:panelGrid>
</h:panelGroup> </h:panelGroup>
</h:form> </h:form>
......
code/MoyaWeb/WebContent/user/sendPicture.xhtml
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<div id="webcamcontainer" style="display: none;"> <div id="webcamcontainer" style="display: none;">
<h:form> <h:form>
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" /> <p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" onerror="location.reload(true);" />
<p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" /> <p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);"/>
</h:form> </h:form>
</div> </div>
......
code/MoyaWeb/WebContent/useradmin/overview.xhtml
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<p:inputTextarea /> <p:inputTextarea />
<br /> <br />
<p:commandButton oncomplete="PF('dialog').hide()" actionListener="#{userOverviewView.rejectCard()}" value="Apply" /> <p:commandButton oncomplete="PF('dialog').hide()" actionListener="#{userOverviewView.rejectCard()}" value="Apply" onerror="location.reload(true);"/>
<p:commandButton onclick="PF('dialog').hide()" type="button" value="Cancel" /> <p:commandButton onclick="PF('dialog').hide()" type="button" value="Cancel" onerror="location.reload(true);"/>
</p:dialog> </p:dialog>
<h:form id="form"> <h:form id="form">
...@@ -48,11 +48,11 @@ ...@@ -48,11 +48,11 @@
</h:panelGrid> </h:panelGrid>
</p:column> </p:column>
<p:column styleClass="cardstatus-#{cartItem.printedCard == null ? 'nonprintable' : cartItem.printedCard.cardState.toStringLower()}"> <p:column styleClass="cardstatus-#{cartItem.printedCard == null ? 'nonprintable' : cartItem.printedCard.cardState.toStringLower()}">
<p:commandButton value="OK #{table.rowIndex}" actionListener="#{userOverviewView.acceptCard()}" ajax="true" update="schneider cardinfo"> <p:commandButton value="OK #{table.rowIndex}" actionListener="#{userOverviewView.acceptCard()}" ajax="true" onerror="location.reload(true);" update="schneider cardinfo">
<!-- <f:ajax execute="uov-items" render="@all"></f:ajax> --> <!-- <f:ajax execute="uov-items" render="@all"></f:ajax> -->
</p:commandButton> </p:commandButton>
<p:commandButton id="Reject" value="Reject" onclick="PF('dialog').show();" type="button" /> <p:commandButton id="Reject" value="Reject" onclick="PF('dialog').show();" type="button" onerror="location.reload(true);"/>
</p:column> </p:column>
</p:dataTable> </p:dataTable>
</h:form> </h:form>
......
code/MoyaWeb/WebContent/useradmin/sendPicture.xhtml
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<users:previewAndPrintCard /> <users:previewAndPrintCard />
<p:commandButton action="#{userView.acceptPrintedCard()}" value="accept printed card" /> <p:commandButton action="#{userView.acceptPrintedCard()}" value="accept printed card" onerror="location.reload(true);"/>
</h:form> </h:form>
<h:form rendered="#{!empty userView.printedCard}"> <h:form rendered="#{!empty userView.printedCard}">
......
code/MoyaWeb/WebContent/useradmin/showTakePicture.xhtml
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<h:form> <h:form>
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" /> <p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="@all" />
<p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" /> <p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);" />
</h:form> </h:form>
......
code/MoyaWeb/WebContent/voting/vote.xhtml
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</h:column> </h:column>
<h:column> <h:column>
<p:rating id="vote" value="#{entry.ratingVote}" cancel="true" stars="5" required="true"> <p:rating id="vote" value="#{entry.ratingVote}" cancel="true" stars="5" required="true">
<p:ajax event="rate" listener="#{compoView.handleVoteRate}" update=":voteform" /> <p:ajax event="rate" listener="#{compoView.handleVoteRate}" update=":voteform" onerror="location.reload(true);" />
</p:rating> </p:rating>
</h:column> </h:column>
<h:column> <h:column>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!