Merged 3.0 to HEAD

11977: Fix for ETHREEOH-795: Error while create web content based on press-release form and also form caching issue reported by Yong

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-11-19 10:16:16 +00:00
parent 00c028a2e3
commit 9b016f27b9

View File

@@ -71,7 +71,6 @@ import org.alfresco.web.data.QuickSort;
import org.alfresco.web.forms.Form; import org.alfresco.web.forms.Form;
import org.alfresco.web.forms.FormInstanceData; import org.alfresco.web.forms.FormInstanceData;
import org.alfresco.web.forms.FormNotFoundException; import org.alfresco.web.forms.FormNotFoundException;
import org.alfresco.web.forms.FormProcessor;
import org.alfresco.web.forms.FormsService; import org.alfresco.web.forms.FormsService;
import org.alfresco.web.forms.RenderingEngineTemplate; import org.alfresco.web.forms.RenderingEngineTemplate;
import org.alfresco.web.forms.Rendition; import org.alfresco.web.forms.Rendition;
@@ -94,14 +93,10 @@ public class CreateWebContentWizard extends CreateContentWizard
private static final Log logger = LogFactory.getLog(CreateWebContentWizard.class); private static final Log logger = LogFactory.getLog(CreateWebContentWizard.class);
protected String content = null;
transient private List<SelectItem> createMimeTypes;
transient private List<SelectItem> formChoices; transient private List<SelectItem> formChoices;
protected String createdPath = null; protected String createdPath = null;
protected List<Rendition> renditions = null; protected List<Rendition> renditions = null;
protected FormInstanceData formInstanceData = null; protected FormInstanceData formInstanceData = null;
protected FormProcessor.Session formProcessorSession = null;
transient private Document instanceDataDocument = null;
protected boolean formSelectDisabled = false; protected boolean formSelectDisabled = false;
protected boolean startWorkflow = false; protected boolean startWorkflow = false;
protected List<String> locksToReturnToMainStoreOnCancel = null; protected List<String> locksToReturnToMainStoreOnCancel = null;
@@ -112,7 +107,6 @@ public class CreateWebContentWizard extends CreateContentWizard
transient private AVMSyncService avmSyncService; transient private AVMSyncService avmSyncService;
protected AVMBrowseBean avmBrowseBean; protected AVMBrowseBean avmBrowseBean;
protected FilePickerBean filePickerBean; protected FilePickerBean filePickerBean;
transient private FormsService formsService;
/** /**
* @param avmService The AVMService to set. * @param avmService The AVMService to set.