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.2 to HEAD

Browse Source 
18358: Merged DEV_TEMPORARY to V3.2
                  18177 & 18342:  ETHREEOH-3979: Web Forms: Inline images within TinyMCE controls aren't displayed correctly

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2010-01-28 21:18:35 +00:00
parent 974b578395
commit 6989a3fcb3
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/web/forms/xforms/XFormsProcessor.java
View File

@@ -213,7 +213,8 @@ public class XFormsProcessor implements FormProcessor
js.append("alfresco.constants.AVM_WEBAPP_URL = '");
if (avmWebApp != null)
{
String storeName = avmBrowseBean.getSandbox();
//Use preview store because when user upload image it appears in preview, not in main store.
String storeName = AVMUtil.getCorrespondingPreviewStoreName(avmBrowseBean.getSandbox());
if (storeName != null)
{
js.append(JavaScriptUtils.javaScriptEscape(fc.getExternalContext().getRequestContextPath() + "/wcs/api/path/content/avm/" +