Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java?rev=1636339&r1=1636338&r2=1636339&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java Mon Nov 3 12:42:03 2014 @@ -334,7 +334,7 @@ public abstract class ModelFormAction { parentModel.runFormActions(context); break; case ROW_ACTIONS: - ModelWidgetAction.runSubActions(parentModel.rowActions, context); + ModelWidgetAction.runSubActions(parentModel.getRowActions(), context); break; } }
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=1636339&r1=1636338&r2=1636339&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Mon Nov 3 12:42:03 2014 @@ -962,7 +962,7 @@ public class HtmlFormRenderer extends Ht updateAreas.add(new ModelForm.UpdateArea("submit", formId, backgroundSubmitRefreshTarget)); } - boolean ajaxEnabled = (updateAreas != null || UtilValidate.isNotEmpty(backgroundSubmitRefreshTarget)) && this.javaScriptEnabled; + boolean ajaxEnabled = (UtilValidate.isNotEmpty(updateAreas) || UtilValidate.isNotEmpty(backgroundSubmitRefreshTarget)) && this.javaScriptEnabled; if (ajaxEnabled) { writer.append("<input type=\"button\""); } else { Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=1636339&r1=1636338&r2=1636339&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Mon Nov 3 12:42:03 2014 @@ -284,7 +284,6 @@ public class ModelTree extends ModelWidg protected Label label; protected Link link; protected ModelTree modelTree; - protected String name; protected String pkName; protected String renderStyle; protected FlexibleStringExpander screenLocationExdr; @@ -297,7 +296,6 @@ public class ModelTree extends ModelWidg public ModelNode(Element nodeElement, ModelTree modelTree) { super(nodeElement); this.modelTree = modelTree; - this.name = nodeElement.getAttribute("name"); this.expandCollapseStyle = nodeElement.getAttribute("expand-collapse-style"); this.wrapStyleExdr = FlexibleStringExpander.getInstance(nodeElement.getAttribute("wrap-style")); this.renderStyle = nodeElement.getAttribute("render-style"); @@ -443,22 +441,22 @@ public class ModelTree extends ModelWidg } } catch (ScreenRenderException e) { String errMsg = "Error rendering included label with name [" - + name + "] : " + e.toString(); + + getName() + "] : " + e.toString(); Debug.logError(e, errMsg, module); throw new RuntimeException(errMsg); } catch (SAXException e) { String errMsg = "Error rendering included label with name [" - + name + "] : " + e.toString(); + + getName() + "] : " + e.toString(); Debug.logError(e, errMsg, module); throw new RuntimeException(errMsg); } catch (ParserConfigurationException e3) { String errMsg = "Error rendering included label with name [" - + name + "] : " + e3.toString(); + + getName() + "] : " + e3.toString(); Debug.logError(e3, errMsg, module); throw new RuntimeException(errMsg); } catch (IOException e2) { String errMsg = "Error rendering included label with name [" - + name + "] : " + e2.toString(); + + getName() + "] : " + e2.toString(); Debug.logError(e2, errMsg, module); throw new RuntimeException(errMsg); } @@ -578,10 +576,6 @@ public class ModelTree extends ModelWidg } } - public String getName() { - return name; - } - public String getEntryName() { return this.entryName; } @@ -613,7 +607,7 @@ public class ModelTree extends ModelWidg } public boolean isRootNode() { - return name.equals(modelTree.getRootNodeName()); + return getName().equals(modelTree.getRootNodeName()); } public boolean showPeers(int currentDepth, Map<String, Object> context) {
