Created
January 3, 2017 23:03
-
-
Save stiemannkj1/24288b448c81234a18a18b84b8e76d63 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/demo/jsf-flows-portlet/src/main/java/com/liferay/faces/demos/service/CustomerServiceMockImpl.java b/demo/jsf-flows-portlet/src/main/java/com/liferay/faces/demos/service/CustomerServiceMockImpl.java | |
| index 3cb33c7..62e800a 100755 | |
| --- a/demo/jsf-flows-portlet/src/main/java/com/liferay/faces/demos/service/CustomerServiceMockImpl.java | |
| +++ b/demo/jsf-flows-portlet/src/main/java/com/liferay/faces/demos/service/CustomerServiceMockImpl.java | |
| @@ -19,7 +19,7 @@ import java.io.Serializable; | |
| import java.util.HashMap; | |
| import java.util.Map; | |
| -import javax.faces.bean.ApplicationScoped; | |
| +import javax.enterprise.context.ApplicationScoped; | |
| import com.liferay.faces.demos.dto.Customer; | |
| diff --git a/demo/jsf-flows-portlet/src/main/webapp/booking/checkout.xhtml b/demo/jsf-flows-portlet/src/main/webapp/booking/checkout.xhtml | |
| index 8232297..6729251 100644 | |
| --- a/demo/jsf-flows-portlet/src/main/webapp/booking/checkout.xhtml | |
| +++ b/demo/jsf-flows-portlet/src/main/webapp/booking/checkout.xhtml | |
| @@ -9,7 +9,7 @@ | |
| <alloy:column width="33"> | |
| <alloy:fieldset> | |
| <alloy:field id="titleField" label="#{i18n['title']}"> | |
| - <h:selectOneMenu id="titleId" value="#{bookingFlowModelBean.customer.titleId}"> | |
| + <h:selectOneMenu id="titleId" value="#{bookingFlowModelBean.customer.titleId}" required="true"> | |
| <f:selectItem itemLabel="#{i18n['select']}" itemValue="" /> | |
| <f:selectItems itemValue="#{title.titleId}" itemLabel="#{title.abbreviation}" value="#{titleService.titles}" | |
| var="title" /> | |
| @@ -17,28 +17,28 @@ | |
| </h:selectOneMenu> | |
| <h:message for="titleId" /> | |
| </alloy:field> | |
| - <alloy:field id="firstNameField" label="#{i18n['first-name']}" required="true"> | |
| - <h:inputText id="firstName" value="#{bookingFlowModelBean.customer.firstName}"> | |
| - <ui:remove><f:ajax render="firstNameField" /></ui:remove> | |
| + <alloy:field id="firstNameField" label="#{i18n['first-name']}"> | |
| + <h:inputText id="firstName" value="#{bookingFlowModelBean.customer.firstName}" required="true"> | |
| + <f:ajax render="firstNameField" /> | |
| </h:inputText> | |
| <h:message for="firstName" /> | |
| </alloy:field> | |
| - <alloy:field id="lastNameField" label="#{i18n['last-name']}" required="true"> | |
| - <h:inputText id="lastName" value="#{bookingFlowModelBean.customer.lastName}"> | |
| - <ui:remove><f:ajax render="lastNameField" /></ui:remove> | |
| + <alloy:field id="lastNameField" label="#{i18n['last-name']}"> | |
| + <h:inputText id="lastName" value="#{bookingFlowModelBean.customer.lastName}" required="true"> | |
| + <f:ajax render="lastNameField" /> | |
| </h:inputText> | |
| <h:message for="lastName" /> | |
| </alloy:field> | |
| - <alloy:field id="emailAddressField" label="#{i18n['email-address']}" required="true"> | |
| + <alloy:field id="emailAddressField" label="#{i18n['email-address']}"> | |
| <h:inputText id="emailAddress" validatorMessage="#{i18n['invalid-email-address']}" | |
| - value="#{bookingFlowModelBean.customer.emailAddress}"> | |
| + value="#{bookingFlowModelBean.customer.emailAddress}" required="true"> | |
| <f:validateRegex pattern=".+[@].+[.].+" /> | |
| - <ui:remove><f:ajax render="emailAddressField" /></ui:remove> | |
| + <f:ajax render="emailAddressField" /> | |
| </h:inputText> | |
| <h:message for="emailAddress" /> | |
| </alloy:field> | |
| - <alloy:field id="phoneNumberField" label="#{i18n['phone-number']}" required="true"> | |
| - <h:inputText id="phoneNumber" value="#{bookingFlowModelBean.customer.phoneNumber}"> | |
| + <alloy:field id="phoneNumberField" label="#{i18n['phone-number']}"> | |
| + <h:inputText id="phoneNumber" value="#{bookingFlowModelBean.customer.phoneNumber}" required="true"> | |
| <f:ajax render="phoneNumberField" /> | |
| </h:inputText> | |
| <h:message for="phoneNumber" /> | |
| @@ -47,8 +47,8 @@ | |
| </alloy:column> | |
| <alloy:column width="33"> | |
| <alloy:fieldset> | |
| - <alloy:field id="addressLine1Field" label="#{i18n['address-line-1']}" required="true"> | |
| - <h:inputText id="addressLine1" value="#{bookingFlowModelBean.customer.addressLine1}"> | |
| + <alloy:field id="addressLine1Field" label="#{i18n['address-line-1']}"> | |
| + <h:inputText id="addressLine1" value="#{bookingFlowModelBean.customer.addressLine1}" required="true"> | |
| <f:ajax render="addressLine1Field" /> | |
| </h:inputText> | |
| <h:message for="addressLine1" /> | |
| @@ -102,8 +102,8 @@ | |
| </h:inputText> | |
| <h:message for="accountNumberField" /> | |
| </alloy:field> | |
| - <alloy:field id="expirationMonthField" label="#{i18n['expiration-month']}" required="true"> | |
| - <input jsf:id="expirationMonth" jsf:value="#{bookingFlowModelBean.customer.expirationMonth}" type="month"> | |
| + <alloy:field id="expirationMonthField" label="#{i18n['expiration-month']}"> | |
| + <input jsf:id="expirationMonth" jsf:value="#{bookingFlowModelBean.customer.expirationMonth}" type="month" jsf:required="true"> | |
| <f:convertDateTime pattern="yyyy-MM" /> | |
| <f:ajax render="expirationMonthField" /> | |
| </input> | |
| @@ -120,7 +120,7 @@ | |
| </alloy:row> | |
| <hr /> | |
| <h:commandButton action="receipt" value="#{i18n['purchase']}"> | |
| - <f:ajax execute="@form" /> | |
| + <f:ajax execute="@form" render="@form" /> | |
| </h:commandButton> | |
| </h:form> | |
| </h:body> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment