inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD

Browse Source 
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
This commit is contained in:
Gavin Cornwell
2009-01-30 14:14:51 +00:00
parent f70b674593
commit 91e042144c
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/web/forms/RenderingEngineTemplateImpl.java
View File

@@ -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<QName, Object> model = new HashMap<QName, Object>();
// add simple scalar parameters

2
source/java/org/alfresco/web/forms/xforms/XFormsBean.java
View File

@@ -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;

2
source/web/scripts/ajax/xforms.js
View File

@@ -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);
}