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 
14077: Merged V2.2 to V3.1
        14074: Fix ETWOTWO-929 and ETWOTWO-1175 (WCM preview)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14568 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-06-05 17:12:00 +00:00
parent 9c1d8b616d
commit 50827e1bbb
11 changed files with 49 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/web/forms/FormInstanceDataImpl.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -39,14 +39,12 @@ import org.alfresco.model.WCMAppModel;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.avm.AVMNotFoundException;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avm.locking.AVMLock;
import org.alfresco.service.cmr.avm.locking.AVMLockingService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.bean.wcm.AVMUtil;
@@ -171,7 +169,7 @@ import org.xml.sax.SAXException;
public String getUrl()
{
return AVMUtil.buildAssetUrl(this.getPath());
return AVMUtil.getPreviewURI(this.getPath());
}
public List<FormInstanceData.RegenerateResult> regenerateRenditions()

4
source/java/org/alfresco/web/forms/RenditionImpl.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -211,7 +211,7 @@ import org.xml.sax.SAXException;
public String getUrl()
{
return AVMUtil.buildAssetUrl(this.getPath());
return AVMUtil.getPreviewURI(this.getPath());
}
public String getFileTypeImage()

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

@@ -619,8 +619,8 @@ public class XFormsBean implements Serializable
{
// It's a web project asset include / import
final String baseURI = (uri.charAt(0) == '/'
? AVMUtil.buildStoreUrl(AVMUtil.getStoreName(cwdAvmPath))
: AVMUtil.buildAssetUrl(cwdAvmPath));
? AVMUtil.getPreviewURI(AVMUtil.getStoreName(cwdAvmPath))
: AVMUtil.getPreviewURI(cwdAvmPath));
finalURI = baseURI + uri;
}