Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

swf 962, svn 961, svn 960

Browse Source
This commit is contained in:
Keith Donald
2008-11-22 00:45:00 +00:00
parent 643fa838ef
commit 0c086b6622
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-binding/src/main/java/org/springframework/binding/mapping/results/AbstractMappingResult.java
View File

@@ -51,7 +51,8 @@ public abstract class AbstractMappingResult implements MappingResult {
public abstract Object getMappedValue();
public String toString() {
ToStringCreator creator = new ToStringCreator(this).append("code", getCode()).append("error", isError());
ToStringCreator creator = new ToStringCreator(this).append("mapping", mapping).append("code", getCode())
.append("error", isError());
if (isError()) {
creator.append("errorCause", getErrorCause());
}

6
spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/bookingForm.jsp
View File

@@ -81,13 +81,11 @@
Spring.addDecoration(new Spring.ElementDecoration({
elementId : 'smoking',
widgetType : "dijit.form.RadioButton",
widgetModule : "dijit.form.CheckBox",
widgetAttrs : { value : true }}));
widgetModule : "dijit.form.CheckBox"}));
Spring.addDecoration(new Spring.ElementDecoration({
elementId : 'non-smoking',
widgetType : "dijit.form.RadioButton",
widgetModule : "dijit.form.CheckBox",
widgetAttrs : { value : false }}));
widgetModule : "dijit.form.CheckBox"}));
</script>
</div>
</div>

6
spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java
View File

@@ -203,8 +203,10 @@ public abstract class AbstractMvcView implements View {
validate(model);
}
}
requestContext.getFlashScope().put(ViewActionStateHolder.KEY,
new ViewActionStateHolder(eventId, mappingResults));
if (mappingResults != null && mappingResults.hasErrorResults()) {
requestContext.getFlashScope().put(ViewActionStateHolder.KEY,
new ViewActionStateHolder(eventId, mappingResults));
}
}
public boolean hasFlowEvent() {

2
spring-webflow/src/main/java/org/springframework/webflow/mvc/view/BindingModel.java
View File

@@ -199,7 +199,7 @@ public class BindingModel extends AbstractErrors {
}
public boolean test(MappingResult result) {
if (field.equals(result.getMapping().getTargetExpression().getExpressionString())) {
if (result.isError() && field.equals(result.getMapping().getTargetExpression().getExpressionString())) {
return true;
} else {
return false;

2
spring-webflow/src/test/java/org/springframework/webflow/mvc/portlet/PortletMvcViewTests.java
View File

@@ -42,7 +42,7 @@ public class PortletMvcViewTests extends TestCase {
public void testResumeEvent() throws Exception {
MockRequestContext context = new MockRequestContext();
context.putRequestParameter("_eventId", "submit");
context.putRequestParameter("booleanProperty", "true");
context.putRequestParameter("booleanProperty", "bogus");
context.putRequestParameter("_booleanProperty", "whatever");
BindBean bindBean = new BindBean();
StaticExpression modelObject = new StaticExpression(bindBean);