svn commit: r1637805 [3/3] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1637805 [3/3] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java?rev=1637805&r1=1637804&r2=1637805&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java Mon Nov 10 08:07:12 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/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=1637805&r1=1637804&r2=1637805&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Mon Nov 10 08:07:12 2014 @@ -45,6 +45,7 @@ import org.ofbiz.webapp.control.RequestH import org.ofbiz.webapp.taglib.ContentUrlTag; import org.ofbiz.widget.ModelWidget; import org.ofbiz.widget.WidgetWorker; +import org.ofbiz.widget.form.FormRenderer; import org.ofbiz.widget.form.FormStringRenderer; import org.ofbiz.widget.form.MacroFormRenderer; import org.ofbiz.widget.form.ModelForm; @@ -70,6 +71,7 @@ import org.ofbiz.widget.form.ModelFormFi import org.ofbiz.widget.form.ModelFormField.TextField; import org.ofbiz.widget.form.ModelFormField.TextFindField; import org.ofbiz.widget.form.ModelFormField.TextareaField; +import org.ofbiz.widget.form.Paginator; import org.ofbiz.widget.form.UtilHelpText; import freemarker.template.TemplateException; @@ -904,7 +906,7 @@ public class HtmlFormRenderer extends Ht } writer.append(" href=\"javascript:document."); - writer.append(modelForm.getCurrentFormName(context)); + writer.append(FormRenderer.getCurrentFormName(modelForm, context)); writer.append(".submit()\">"); writer.append(encode(modelFormField.getTitle(context), modelFormField, context)); @@ -962,7 +964,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 { @@ -1182,7 +1184,7 @@ public class HtmlFormRenderer extends Ht writer.append("\""); } - String containerId = modelForm.getCurrentContainerId(context); + String containerId = FormRenderer.getCurrentContainerId(modelForm, context); if (UtilValidate.isNotEmpty(containerId)) { writer.append(" id=\""); writer.append(containerId); @@ -1205,7 +1207,7 @@ public class HtmlFormRenderer extends Ht } writer.append(" name=\""); - writer.append(modelForm.getCurrentFormName(context)); + writer.append(FormRenderer.getCurrentContainerId(modelForm, context)); writer.append("\">"); boolean useRowSubmit = modelForm.getUseRowSubmit(); @@ -1226,7 +1228,7 @@ public class HtmlFormRenderer extends Ht appendWhitespace(writer); writer.append("<script language=\"JavaScript\" type=\"text/javascript\">"); appendWhitespace(writer); - writer.append("document.").append(modelForm.getCurrentFormName(context)).append("."); + writer.append("document.").append(FormRenderer.getCurrentFormName(modelForm, context)).append("."); writer.append(focusFieldName).append(".focus();"); appendWhitespace(writer); writer.append("</script>"); @@ -1904,7 +1906,7 @@ public class HtmlFormRenderer extends Ht if (uiLabelMap != null) { localizedIconTitle = uiLabelMap.get("CommonViewCalendar"); } - + ModelForm modelForm = modelFormField.getModelForm(); // add calendar pop-up button and seed data IF this is not a "time" type date-find if (!"time".equals(dateFindField.getType())) { if ("date".equals(dateFindField.getType())) { @@ -1912,7 +1914,7 @@ public class HtmlFormRenderer extends Ht } else { writer.append("<a href=\"javascript:call_cal(document."); } - writer.append(modelFormField.getModelForm().getCurrentFormName(context)); + writer.append(FormRenderer.getCurrentFormName(modelForm, context)); writer.append('.'); writer.append(modelFormField.getParameterName(context)); writer.append("_fld0_value,'"); @@ -1989,7 +1991,7 @@ public class HtmlFormRenderer extends Ht } else { writer.append("<a href=\"javascript:call_cal(document."); } - writer.append(modelFormField.getModelForm().getCurrentFormName(context)); + writer.append(FormRenderer.getCurrentFormName(modelForm, context)); writer.append('.'); writer.append(modelFormField.getParameterName(context)); writer.append("_fld1_value,'"); @@ -2076,12 +2078,12 @@ public class HtmlFormRenderer extends Ht } writer.append("/>"); - + ModelForm modelForm = modelFormField.getModelForm(); // add lookup pop-up button String descriptionFieldName = lookupField.getDescriptionFieldName(); if (UtilValidate.isNotEmpty(descriptionFieldName)) { writer.append("<a href=\"javascript:call_fieldlookup3(document."); - writer.append(modelFormField.getModelForm().getCurrentFormName(context)); + writer.append(FormRenderer.getCurrentFormName(modelForm, context)); writer.append('.'); writer.append(modelFormField.getParameterName(context)); writer.append(",'"); @@ -2089,7 +2091,7 @@ public class HtmlFormRenderer extends Ht writer.append(",'"); } else { writer.append("<a href=\"javascript:call_fieldlookup2(document."); - writer.append(modelFormField.getModelForm().getCurrentFormName(context)); + writer.append(FormRenderer.getCurrentFormName(modelForm, context)); writer.append('.'); writer.append(modelFormField.getParameterName(context)); writer.append(",'"); @@ -2100,7 +2102,7 @@ public class HtmlFormRenderer extends Ht for (String targetParameter: targetParameterList) { // named like: document.${formName}.${targetParameter}.value writer.append(", document."); - writer.append(modelFormField.getModelForm().getCurrentFormName(context)); + writer.append(FormRenderer.getCurrentFormName(modelForm, context)); writer.append("."); writer.append(targetParameter); writer.append(".value"); @@ -2140,6 +2142,26 @@ public class HtmlFormRenderer extends Ht return result; } + private int getActualPageSize(Map<String, Object> context) { + Integer value = (Integer) context.get("actualPageSize"); + return value != null ? value.intValue() : (getHighIndex(context) - getLowIndex(context)); + } + + private int getHighIndex(Map<String, Object> context) { + Integer value = (Integer) context.get("highIndex"); + return value != null ? value.intValue() : 0; + } + + private int getListSize(Map<String, Object> context) { + Integer value = (Integer) context.get("listSize"); + return value != null ? value.intValue() : 0; + } + + private int getLowIndex(Map<String, Object> context) { + Integer value = (Integer) context.get("lowIndex"); + return value != null ? value.intValue() : 0; + } + public void renderNextPrev(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException { boolean ajaxEnabled = false; List<ModelForm.UpdateArea> updateAreas = modelForm.getOnPaginateUpdateAreas(); @@ -2162,13 +2184,13 @@ public class HtmlFormRenderer extends Ht String viewIndexParam = modelForm.getMultiPaginateIndexField(context); String viewSizeParam = modelForm.getMultiPaginateSizeField(context); - int viewIndex = modelForm.getViewIndex(context); - int viewSize = modelForm.getViewSize(context); - int listSize = modelForm.getListSize(context); - - int lowIndex = modelForm.getLowIndex(context); - int highIndex = modelForm.getHighIndex(context); - int actualPageSize = modelForm.getActualPageSize(context); + int viewIndex = Paginator.getViewIndex(modelForm, context); + int viewSize = Paginator.getViewSize(modelForm, context); + int listSize = getListSize(context); + + int lowIndex = getLowIndex(context); + int highIndex = getHighIndex(context); + int actualPageSize = getActualPageSize(context); // if this is all there seems to be (if listSize < 0, then size is unknown) if (actualPageSize >= listSize && listSize >= 0) return; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java?rev=1637805&r1=1637804&r2=1637805&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormWrapper.java Mon Nov 10 08:07:12 2014 @@ -36,6 +36,7 @@ import org.ofbiz.service.LocalDispatcher import org.ofbiz.widget.form.FormFactory; import org.ofbiz.widget.form.FormStringRenderer; import org.ofbiz.widget.form.ModelForm; +import org.ofbiz.widget.form.FormRenderer; import org.xml.sax.SAXException; @@ -107,7 +108,7 @@ public class HtmlFormWrapper { } @SuppressWarnings("unchecked") - public StringWriter renderFormString(Object contextStack) throws IOException { + public StringWriter renderFormString(Object contextStack) throws Exception { if (contextStack instanceof MapStack) { return renderFormString((MapStack) contextStack); } else { @@ -115,17 +116,19 @@ public class HtmlFormWrapper { return renderFormString(); } } - public StringWriter renderFormString(MapStack<String> contextStack) throws IOException { + public StringWriter renderFormString(MapStack<String> contextStack) throws Exception { // create a new context with the current context on the bottom contextStack.push(this.context); StringWriter buffer = new StringWriter(); - modelForm.renderFormString(buffer, contextStack, renderer); + FormRenderer formRenderer = new FormRenderer(modelForm, renderer); + formRenderer.render(buffer, contextStack); contextStack.pop(); return buffer; } - public StringWriter renderFormString() throws IOException { + public StringWriter renderFormString() throws Exception { StringWriter buffer = new StringWriter(); - modelForm.renderFormString(buffer, context, renderer); + FormRenderer formRenderer = new FormRenderer(modelForm, renderer); + formRenderer.render(buffer, context); return buffer; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java?rev=1637805&r1=1637804&r2=1637805&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java Mon Nov 10 08:07:12 2014 @@ -47,6 +47,7 @@ import org.ofbiz.widget.WidgetDataResour import org.ofbiz.widget.WidgetWorker; import org.ofbiz.widget.form.FormStringRenderer; import org.ofbiz.widget.form.ModelForm; +import org.ofbiz.widget.form.Paginator; import org.ofbiz.widget.menu.MenuStringRenderer; import org.ofbiz.widget.menu.ModelMenu; import org.ofbiz.widget.screen.ModelScreenWidget; @@ -254,12 +255,32 @@ public class HtmlScreenRenderer extends } } + private int getActualPageSize(Map<String, Object> context) { + Integer value = (Integer) context.get("actualPageSize"); + return value != null ? value.intValue() : (getHighIndex(context) - getLowIndex(context)); + } + + private int getHighIndex(Map<String, Object> context) { + Integer value = (Integer) context.get("highIndex"); + return value != null ? value.intValue() : 0; + } + + private int getListSize(Map<String, Object> context) { + Integer value = (Integer) context.get("listSize"); + return value != null ? value.intValue() : 0; + } + + private int getLowIndex(Map<String, Object> context) { + Integer value = (Integer) context.get("lowIndex"); + return value != null ? value.intValue() : 0; + } + protected void renderScreenletPaginateMenu(Appendable writer, Map<String, Object> context, ModelScreenWidget.Form form) throws IOException { HttpServletResponse response = (HttpServletResponse) context.get("response"); HttpServletRequest request = (HttpServletRequest) context.get("request"); ModelForm modelForm = form.getModelForm(context); modelForm.runFormActions(context); - modelForm.preparePager(context); + Paginator.preparePager(modelForm, context); String targetService = modelForm.getPaginateTarget(context); if (targetService == null) { targetService = "${targetService}"; @@ -270,13 +291,13 @@ public class HtmlScreenRenderer extends String viewIndexParam = modelForm.getMultiPaginateIndexField(context); String viewSizeParam = modelForm.getMultiPaginateSizeField(context); - int viewIndex = modelForm.getViewIndex(context); - int viewSize = modelForm.getViewSize(context); - int listSize = modelForm.getListSize(context); - - int lowIndex = modelForm.getLowIndex(context); - int highIndex = modelForm.getHighIndex(context); - int actualPageSize = modelForm.getActualPageSize(context); + int viewIndex = Paginator.getViewIndex(modelForm, context); + int viewSize = Paginator.getViewSize(modelForm, context); + int listSize = getListSize(context); + + int lowIndex = getLowIndex(context); + int highIndex = getHighIndex(context); + int actualPageSize = getActualPageSize(context); // if this is all there seems to be (if listSize < 0, then size is unknown) if (actualPageSize >= listSize && listSize >= 0) return; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=1637805&r1=1637804&r2=1637805&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Mon Nov 10 08:07:12 2014 @@ -55,6 +55,7 @@ import org.ofbiz.widget.WidgetWorker; import org.ofbiz.widget.form.FormStringRenderer; import org.ofbiz.widget.form.MacroFormRenderer; import org.ofbiz.widget.form.ModelForm; +import org.ofbiz.widget.form.Paginator; import org.ofbiz.widget.html.HtmlScreenRenderer.ScreenletMenuRenderer; import org.ofbiz.widget.menu.MenuStringRenderer; import org.ofbiz.widget.screen.ModelScreenWidget.Column; @@ -682,7 +683,7 @@ public class MacroScreenRenderer impleme HttpServletRequest request = (HttpServletRequest) context.get("request"); ModelForm modelForm = form.getModelForm(context); modelForm.runFormActions(context); - modelForm.preparePager(context); + Paginator.preparePager(modelForm, context); String targetService = modelForm.getPaginateTarget(context); if (targetService == null) { targetService = "${targetService}"; @@ -693,12 +694,12 @@ public class MacroScreenRenderer impleme String viewIndexParam = modelForm.getMultiPaginateIndexField(context); String viewSizeParam = modelForm.getMultiPaginateSizeField(context); - int viewIndex = modelForm.getViewIndex(context); - int viewSize = modelForm.getViewSize(context); - int listSize = modelForm.getListSize(context); + int viewIndex = Paginator.getViewIndex(modelForm, context); + int viewSize = Paginator.getViewSize(modelForm, context); + int listSize = Paginator.getListSize(context); - int highIndex = modelForm.getHighIndex(context); - int actualPageSize = modelForm.getActualPageSize(context); + int highIndex = Paginator.getHighIndex(context); + int actualPageSize = Paginator.getActualPageSize(context); // if this is all there seems to be (if listSize < 0, then size is unknown) if (actualPageSize >= listSize && listSize >= 0) return; @@ -781,7 +782,7 @@ public class MacroScreenRenderer impleme } Map<String, Object> parameters = new HashMap<String, Object>(); - parameters.put("lowIndex", modelForm.getLowIndex(context)); + parameters.put("lowIndex", Paginator.getLowIndex(context)); parameters.put("actualPageSize", actualPageSize); parameters.put("ofLabel", ofLabel); parameters.put("listSize", listSize); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java?rev=1637805&r1=1637804&r2=1637805&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java Mon Nov 10 08:07:12 2014 @@ -162,19 +162,7 @@ public class ModelScreen extends ModelWi // render the screen, starting with the top-level section this.section.renderWidgetString(writer, context, screenStringRenderer); - } catch (ScreenRenderException e) { - throw e; - } catch (RuntimeException e) { - String errMsg = "Error rendering screen [" + this.sourceLocation + "#" + getName() + "]: " + e.toString(); - Debug.logError(errMsg + ". Rolling back transaction.", module); - try { - // only rollback the transaction if we started one... - TransactionUtil.rollback(beganTransaction, errMsg, e); - } catch (GenericEntityException e2) { - Debug.logError(e2, "Could not rollback transaction: " + e2.toString(), module); - } - // after rolling back, rethrow the exception - throw new ScreenRenderException(errMsg, e); + TransactionUtil.commit(beganTransaction); } catch (Exception e) { String errMsg = "Error rendering screen [" + this.sourceLocation + "#" + getName() + "]: " + e.toString(); Debug.logError(errMsg + ". Rolling back transaction.", module); @@ -189,13 +177,6 @@ public class ModelScreen extends ModelWi // after rolling back, rethrow the exception throw new ScreenRenderException(errMsg, e); - } finally { - // only commit the transaction if we started one... this will throw an exception if it fails - try { - TransactionUtil.commit(beganTransaction); - } catch (GenericEntityException e2) { - Debug.logError(e2, "Could not commit transaction: " + e2.toString(), module); - } } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=1637805&r1=1637804&r2=1637805&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Mon Nov 10 08:07:12 2014 @@ -51,6 +51,7 @@ import org.ofbiz.widget.PortalPageWorker import org.ofbiz.widget.WidgetFactory; import org.ofbiz.widget.WidgetWorker; import org.ofbiz.widget.form.FormFactory; +import org.ofbiz.widget.form.FormRenderer; import org.ofbiz.widget.form.FormStringRenderer; import org.ofbiz.widget.form.ModelForm; import org.ofbiz.widget.menu.MenuFactory; @@ -928,9 +929,10 @@ public abstract class ModelScreenWidget UtilGenerics.<MapStack<String>>cast(context).push(); } ModelForm modelForm = getModelForm(context); + FormRenderer renderer = new FormRenderer(modelForm, formStringRenderer); try { - modelForm.renderFormString(writer, context, formStringRenderer); - } catch (IOException e) { + renderer.render(writer, context); + } catch (Exception e) { String errMsg = "Error rendering included form named [" + getName() + "] at location [" + this.getLocation(context) + "]: " + e.toString(); Debug.logError(e, errMsg, module); throw new RuntimeException(errMsg + e); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=1637805&r1=1637804&r2=1637805&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Mon Nov 10 08:07:12 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) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/templates/tomcat6/server.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/templates/tomcat6/server.xml?rev=1637805&r1=1637804&r2=1637805&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/templates/tomcat6/server.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/templates/tomcat6/server.xml Mon Nov 10 08:07:12 2014 @@ -80,7 +80,7 @@ described in the APR documentation --> <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true" maxThreads="150" scheme="https" secure="true" - clientAuth="false" sslProtocol="TLS" + clientAuth="false" sslProtocol="TLSv1.1" protocols="TLSv1.1" keystoreFile="${ofbizHome}/framework/base/config/ofbizssl.jks" keystorePass="changeit"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=1637805&r1=1637804&r2=1637805&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Mon Nov 10 08:07:12 2014 @@ -116,10 +116,18 @@ </if-not-empty> </simple-method> <simple-method method-name="addProjectMgrResource" short-description="make parties available in the project manager."> - <set-service-fields service-name="createPartyRole" map="parameters" to-map="roleData"/> - <call-service service-name="createPartyRole" in-map-name="roleData"/> + <entity-one value-field="partyRole" entity-name="PartyRole"/> + <if-empty field="partyRole"> + <set-service-fields service-name="createPartyRole" map="parameters" to-map="roleData"/> + <call-service service-name="createPartyRole" in-map-name="roleData"/> + </if-empty> <set field="roleData.roleTypeId" value="PROJECT_TEAM"/> - <call-service service-name="createPartyRole" in-map-name="roleData"/> + <entity-one value-field="partyRole" entity-name="PartyRole"> + <field-map field-name="roleTypeId" from-field="roleData.roleTypeId"/> + </entity-one> + <if-empty field="partyRole"> + <call-service service-name="createPartyRole" in-map-name="roleData"/> + </if-empty> </simple-method> <!-- create workEffort content --> <simple-method method-name="createWorkEffortContent" short-description="Creates Party Associated Content" login-required="false"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/branch13.7-demo.patch URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/branch13.7-demo.patch?rev=1637805&r1=1637804&r2=1637805&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/branch13.7-demo.patch (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/branch13.7-demo.patch Mon Nov 10 08:07:12 2014 @@ -1,30 +1,3 @@ - -Property changes on: . -___________________________________________________________________ -Added: svn:externals - + specialpurpose/appserver/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/appserver -specialpurpose/assetmaint/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/assetmaint -specialpurpose/birt/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/birt -specialpurpose/cmssite/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/cmssite -specialpurpose/ebay/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/ebay -specialpurpose/ebaystore/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/ebaystore -specialpurpose/example/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example -specialpurpose/exampleext/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/exampleext -specialpurpose/googlebase/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/googlebase -specialpurpose/googlecheckout/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/googlecheckout -specialpurpose/hhfacility/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/hhfacility -specialpurpose/jetty/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/jetty -specialpurpose/ldap/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/ldap -specialpurpose/lucene/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/lucene -specialpurpose/myportal/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/myportal -specialpurpose/pos/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/pos -specialpurpose/projectmgr/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/projectmgr -specialpurpose/oagis/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/oagis -specialpurpose/scrum/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/scrum -specialpurpose/webpos/ https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/webpos - - - Index: framework/webapp/config/url.properties =================================================================== --- framework/webapp/config/url.properties (revision 1608427) @@ -37,68 +10,3 @@ Index: framework/webapp/config/url.prope +port.https.enabled=N port.https=8443 force.https.host= - -Index: specialpurpose/build.xml -=================================================================== ---- specialpurpose/build.xml (revision 1608427) -+++ specialpurpose/build.xml (working copy) -@@ -19,7 +19,26 @@ - --> - - <project name="OFBiz Special Purpose Applications Build" default="build" basedir="."> -- <import file="../macros.xml"/> - <filelist id="specialpurpose-builds" dir="specialpurpose" -- files="ecommerce/build.xml"/> -+ files=" -+ appserver/build.xml, -+ assetmaint/build.xml, -+ birt/build.xml, -+ ebay/build.xml, -+ ebaystore/build.xml, -+ ecommerce/build.xml, -+ example/build.xml, -+ googlebase/build.xml, -+ googlecheckout/build.xml, -+ hhfacility/build.xml, -+ jetty/build.xml, -+ ldap/build.xml, -+ lucene/build.xml, -+ oagis/build.xml, -+ pos/build.xml, -+ projectmgr/build.xml, -+ scrum/build.xml, -+ webpos/build.xml -+ "/> - </project> -+ -Index: specialpurpose/component-load.xml -=================================================================== ---- specialpurpose/component-load.xml (revision 1608427) -+++ specialpurpose/component-load.xml (working copy) -@@ -20,5 +20,26 @@ - - <component-loader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/component-loader.xsd"> -+ <load-component component-location="appserver"/> -+ <load-component component-location="lucene"/> - <load-component component-location="ecommerce"/> -+ <load-component component-location="pos"/> -+ <load-component component-location="hhfacility"/> -+ <load-component component-location="assetmaint"/> -+ <load-component component-location="cmssite"/> -+ <load-component component-location="projectmgr"/> -+ <load-component component-location="scrum"/> -+ <load-component component-location="oagis"/> -+ <load-component component-location="googlebase"/> -+ <load-component component-location="googlecheckout"/> -+ <load-component component-location="ebay"/> -+ <load-component component-location="ebaystore"/> -+ <load-component component-location="myportal"/> -+ <load-component component-location="ldap"/> -+ <load-component component-location="webpos"/> -+ <load-component component-location="birt"/> -+ <load-component component-location="example"/> -+ <load-component component-location="exampleext"/> -+ <!-- <load-component component-location="jetty"/> --> - </component-loader> -+ |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |