Fixed failing FacesScaffold test involving 1:1 expansion

forge · May 3, 2013 · d582898 · d582898
1 parent 626d9ed
commit d582898
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ain/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/EntityWidgetBuilder.java b/...ain/java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/EntityWidgetBuilder.java
@@ -583,7 +583,7 @@ protected void addColumnComponent(HtmlDataTable dataTable, Map<String, String> t
                      + StringUtils.decapitalize(columnAttributes.get(NAME));
 
             StaticHtmlMetawidget output = (StaticHtmlMetawidget) link.getChildren().get(1);
-            output.setValue(valueExpression);
+            output.setValue(StaticFacesUtils.wrapExpression(valueExpression));
          }
          column.getChildren().add(link);
 

diff --git a/...java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/EntityWidgetBuilderTest.java b/...java/org/jboss/forge/scaffold/faces/metawidget/widgetbuilder/EntityWidgetBuilderTest.java
@@ -415,10 +415,10 @@ protected Map<String, String> inspectProperty(Property property)
       result += "<ui:param name=\"_collection\" value=\"#{foo.bars}\"/>";
       result += "<h:dataTable id=\"fooBars\" styleClass=\"data-table\" value=\"#{forgeview:asList(_collection)}\" var=\"_item\">";
       result += "<h:column><f:facet name=\"header\"><h:outputText value=\"Name\"/></f:facet>";
-      result += "<h:link outcome=\"/entityWidgetBuilderTest$FooOneToOne/view\"><f:param name=\"id\" value=\"#{_item.id}\"/><h:outputText id=\"itemName\" value=\"#{_item.name}\"/></h:link>";
+      result += "<h:link outcome=\"/entityWidgetBuilderTest$FooOneToOne/view\"><f:param name=\"id\" value=\"#{_item.id}\"/><h:outputText id=\"itemBarName\" value=\"#{_item.bar.name}\"/></h:link>";
       result += "</h:column>";
       result += "<h:column><f:facet name=\"header\"><h:outputText value=\"Description\"/></f:facet>";
-      result += "<h:link outcome=\"/entityWidgetBuilderTest$FooOneToOne/view\"><f:param name=\"id\" value=\"#{_item.id}\"/><h:outputText id=\"itemDescription\" value=\"#{_item.description}\"/></h:link>";
+      result += "<h:link outcome=\"/entityWidgetBuilderTest$FooOneToOne/view\"><f:param name=\"id\" value=\"#{_item.id}\"/><h:outputText id=\"itemBarDescription\" value=\"#{_item.bar.description}\"/></h:link>";
       result += "</h:column>";
       result += "<h:column footerClass=\"remove-column\" headerClass=\"remove-column\"><h:commandLink action=\"#{_collection.remove(_item)}\" styleClass=\"remove-button\"/></h:column>";
       result += "</h:dataTable>";