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 V2.1 to HEAD

Browse Source 
6338: Some WCM-435.
   6344: Fix for AWC-1452 (dialog close navigation issue)
   6345: Fix for AR-1611 and other related CIFS and NFS fixes
   6346: Minor javadoc fix for ReplicatingContentStore
   6347: Handle exceptions arising from UserTransaction.begin().
   6348: Many WCM fixes in one
            Conflicts resolved on faces-config-beans.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 13:21:08 +00:00
parent 48fa124735
commit 0fb2ae13f9
38 changed files with 1290 additions and 895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/web/bean/wcm/EditWebContentWizard.java
View File

@@ -74,7 +74,6 @@ import org.alfresco.web.data.IDataContainer;
import org.alfresco.web.data.QuickSort;
import org.alfresco.web.forms.Form;
import org.alfresco.web.forms.FormInstanceData;
import org.alfresco.web.forms.FormInstanceDataImpl;
import org.alfresco.web.forms.FormNotFoundException;
import org.alfresco.web.forms.FormProcessor;
import org.alfresco.web.forms.FormsService;
@@ -113,7 +112,7 @@ public class EditWebContentWizard extends CreateWebContentWizard
}
LOGGER.debug("path is " + this.avmNode.getPath());
this.createdPath = AVMUtil.getCorrespondingPathInPreviewStore(this.avmNode.getPath());
this.formInstanceData = new FormInstanceDataImpl(-1, this.createdPath);
this.formInstanceData = this.formsService.getFormInstanceData(-1, this.createdPath);
final WebProject webProject = new WebProject(this.createdPath);
try
{
@@ -152,15 +151,8 @@ public class EditWebContentWizard extends CreateWebContentWizard
final ContentWriter writer = this.avmService.getContentWriter(this.createdPath);
this.content = XMLUtil.toString(this.instanceDataDocument, false);
writer.putContent(this.content);
this.formInstanceData = new FormInstanceDataImpl(-1, this.createdPath)
{
@Override
public Form getForm()
throws FormNotFoundException
{
return EditWebContentWizard.this.getForm();
}
};
// XXXarielb might not need to do this reload
this.formInstanceData = this.formsService.getFormInstanceData(-1, this.createdPath);
final List<FormInstanceData.RegenerateResult> result = this.formInstanceData.regenerateRenditions();
this.renditions = new LinkedList<Rendition>();
for (FormInstanceData.RegenerateResult rr : result)