Skip to content

Riina Antikainen / Moya

Go to a project
Commit 110655ad by Tuomas Riihimäki
Options

Fix errors from web project..

1 parent f03d8ff6
Inline Side-by-side
Showing with 12 additions and 11 deletions
code/MoyaWeb/WebContent/eventorg/editEvent.xhtml
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<f:facet name="header">#{i18n['lanEventProperty.value']}</f:facet> <f:facet name="header">#{i18n['lanEventProperty.value']}</f:facet>
<h:outputText rendered="#{prop.key.text}" value="#{prop.textvalue}" /> <h:outputText rendered="#{prop.key.text}" value="#{prop.textvalue}" />
<h:outputText rendered="#{prop.key.boolean and prop.booleanValue}" value="true" /> <h:outputText rendered="#{prop.key.boolean and prop.booleanValue}" value="true" />
<h:outputText rendered="#{prop.key.boolean and not prop.booleanValue}" value="false" /> <h:outputText rendered="#{prop.key.boolean and ( not prop.booleanValue)}" value="false" />
<h:outputText rendered="#{prop.key.date}" value="#{prop.dateValue}"> <h:outputText rendered="#{prop.key.date}" value="#{prop.dateValue}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
......
code/MoyaWeb/WebContent/resources/cditools/bills/showBill.xhtml
...@@ -67,15 +67,15 @@ ...@@ -67,15 +67,15 @@
<h:outputText rendered="#{!empty cc.attrs.bill.event.organiser.billAddress4}" value="&lt;br />" escape="false" /> <h:outputText rendered="#{!empty cc.attrs.bill.event.organiser.billAddress4}" value="&lt;br />" escape="false" />
<h:outputText id="recAddr4" value="#{cc.attrs.bill.event.organiser.billAddress4}" /> <h:outputText id="recAddr4" value="#{cc.attrs.bill.event.organiser.billAddress4}" />
</h:panelGroup> </h:panelGroup>
<h:outputLabel rendered="#{!cc.attrs.bill.expired and sessionHandler.isEventBoolProperty('ALLOW_BILLING') and !empty cc.attrs.bill.event.organiser.bankName1}" for="bankname1" value="#{i18n['eventorg.bankName1']}" /> <h:outputLabel rendered="#{!cc.attrs.bill.expired and (sessionHandler.isEventBoolProperty('ALLOW_BILLING')) and !empty cc.attrs.bill.event.organiser.bankName1}" for="bankname1" value="#{i18n['eventorg.bankName1']}" />
<h:outputText rendered="#{!cc.attrs.bill.expired and sessionHandler.isEventBoolProperty('ALLOW_BILLING') and !empty cc.attrs.bill.event.organiser.bankName1}" id="bankname1" value="#{cc.attrs.bill.event.organiser.bankName1}" /> <h:outputText rendered="#{!cc.attrs.bill.expired and (sessionHandler.isEventBoolProperty('ALLOW_BILLING')) and !empty cc.attrs.bill.event.organiser.bankName1}" id="bankname1" value="#{cc.attrs.bill.event.organiser.bankName1}" />
<h:outputLabel rendered="#{!cc.attrs.bill.expired and sessionHandler.isEventBoolProperty('ALLOW_BILLING') and !empty cc.attrs.bill.event.organiser.bankNumber1}" for="banknumber1" value="#{i18n['eventorg.bankNumber1']}" /> <h:outputLabel rendered="#{!cc.attrs.bill.expired and (sessionHandler.isEventBoolProperty('ALLOW_BILLING')) and !empty cc.attrs.bill.event.organiser.bankNumber1}" for="banknumber1" value="#{i18n['eventorg.bankNumber1']}" />
<h:outputText rendered="#{!cc.attrs.bill.expired and sessionHandler.isEventBoolProperty('ALLOW_BILLING') and !empty cc.attrs.bill.event.organiser.bankNumber1}" id="banknumber1" value="#{cc.attrs.bill.event.organiser.bankNumber1}" /> <h:outputText rendered="#{!cc.attrs.bill.expired and (sessionHandler.isEventBoolProperty('ALLOW_BILLING')) and !empty cc.attrs.bill.event.organiser.bankNumber1}" id="banknumber1" value="#{cc.attrs.bill.event.organiser.bankNumber1}" />
<h:outputLabel rendered="#{!cc.attrs.bill.expired and sessionHandler.isEventBoolProperty('ALLOW_BILLING') and !empty cc.attrs.bill.event.organiser.bankName2}" for="bankname2" value="#{i18n['eventorg.bankName2']}" /> <h:outputLabel rendered="#{!cc.attrs.bill.expired and (sessionHandler.isEventBoolProperty('ALLOW_BILLING')) and !empty cc.attrs.bill.event.organiser.bankName2}" for="bankname2" value="#{i18n['eventorg.bankName2']}" />
<h:outputText rendered="#{!cc.attrs.bill.expired and sessionHandler.isEventBoolProperty('ALLOW_BILLING') and !empty cc.attrs.bill.event.organiser.bankName2}" id="bankname2" value="#{cc.attrs.bill.event.organiser.bankName2}" /> <h:outputText rendered="#{!cc.attrs.bill.expired and (sessionHandler.isEventBoolProperty('ALLOW_BILLING')) and !empty cc.attrs.bill.event.organiser.bankName2}" id="bankname2" value="#{cc.attrs.bill.event.organiser.bankName2}" />
<h:outputLabel rendered="#{!cc.attrs.bill.expired and sessionHandler.isEventBoolProperty('ALLOW_BILLING') and !empty cc.attrs.bill.event.organiser.bankNumber2}" for="banknumber2" value="#{i18n['eventorg.bankNumber2']}" /> <h:outputLabel rendered="#{!cc.attrs.bill.expired and (sessionHandler.isEventBoolProperty('ALLOW_BILLING')) and !empty cc.attrs.bill.event.organiser.bankNumber2}" for="banknumber2" value="#{i18n['eventorg.bankNumber2']}" />
<h:outputText rendered="#{!cc.attrs.bill.expired and sessionHandler.isEventBoolProperty('ALLOW_BILLING') and !empty cc.attrs.bill.event.organiser.bankNumber2}" id="banknumber2" value="#{cc.attrs.bill.event.organiser.bankNumber2}" /> <h:outputText rendered="#{!cc.attrs.bill.expired and (sessionHandler.isEventBoolProperty('ALLOW_BILLING')) and !empty cc.attrs.bill.event.organiser.bankNumber2}" id="banknumber2" value="#{cc.attrs.bill.event.organiser.bankNumber2}" />
</h:panelGrid> </h:panelGrid>
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserView.java
...@@ -316,9 +316,10 @@ public class UserView extends GenericCDIView { ...@@ -316,9 +316,10 @@ public class UserView extends GenericCDIView {
return permbean.isCurrentUser(user); return permbean.isCurrentUser(user);
} }
public void setCardState() public String setCardState()
{ {
printedCard = cardBean.saveCard(printedCard); printedCard = cardBean.saveCard(printedCard);
return null;
} }
/** /**
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!