From 91e042144ccfc057ddd3e3521717b67fc6d23216 Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Fri, 30 Jan 2009 14:14:51 +0000 Subject: [PATCH] Merged V3.1 to HEAD 12988: Fix for ETHREEOH-1238: Cannot use Jsp:include feature in XSD - 'Store not found' exception 12986: Merged V3.0 to V3.1 12980: Merged V2.2 to V3.0 12726: Fix for ETWOTWO-950: Forms with list control does not work in IE (6 & 7) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12989 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/web/forms/RenderingEngineTemplateImpl.java | 2 +- source/java/org/alfresco/web/forms/xforms/XFormsBean.java | 2 +- source/web/scripts/ajax/xforms.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java b/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java index 0758065398..6441729478 100644 --- a/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java +++ b/source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java @@ -377,7 +377,7 @@ public class RenderingEngineTemplateImpl final String formInstanceDataAvmPath = formInstanceData.getPath(); final String renditionAvmPath = rendition.getPath(); final String parentPath = AVMNodeConverter.SplitBase(formInstanceDataAvmPath)[0]; - final String sandboxUrl = AVMUtil.buildStoreUrl(formInstanceDataAvmPath); + final String sandboxUrl = AVMUtil.buildStoreUrl(AVMUtil.getStoreName(formInstanceDataAvmPath)); final String webappUrl = AVMUtil.buildWebappUrl(formInstanceDataAvmPath); final HashMap model = new HashMap(); // add simple scalar parameters diff --git a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java index f80dad5f85..9f0348cd4e 100644 --- a/source/java/org/alfresco/web/forms/xforms/XFormsBean.java +++ b/source/java/org/alfresco/web/forms/xforms/XFormsBean.java @@ -608,7 +608,7 @@ public class XFormsBean implements Serializable { // It's a web project asset include / import final String baseURI = (uri.charAt(0) == '/' - ? AVMUtil.buildStoreUrl(cwdAvmPath) + ? AVMUtil.buildStoreUrl(AVMUtil.getStoreName(cwdAvmPath)) : AVMUtil.buildAssetUrl(cwdAvmPath)); finalURI = baseURI + uri; diff --git a/source/web/scripts/ajax/xforms.js b/source/web/scripts/ajax/xforms.js index 854d12affa..84eb59de93 100644 --- a/source/web/scripts/ajax/xforms.js +++ b/source/web/scripts/ajax/xforms.js @@ -1193,12 +1193,12 @@ alfresco.xforms.CheckboxSelect = alfresco.xforms.AbstractSelectWidget.extend({ checkbox.setAttribute("name", this.id + "_" + i + "-widget"); checkbox.setAttribute("type", "checkbox"); checkbox.setAttribute("value", values[i].value); + checkboxDiv.appendChild(checkbox); if (initial_value.indexOf(values[i].value) != -1) { this._selectedValues.push(values[i].value); checkbox.checked = true; } - checkboxDiv.appendChild(checkbox); checkboxDiv.appendChild(document.createTextNode(values[i].label)); checkbox.onclick = this._checkbox_clickHandler.bindAsEventListener(this); }