mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged DEV/UI-CLUSTERING2 to HEAD
8348: UI cluster support git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -44,6 +44,7 @@ import org.alfresco.repo.content.MimetypeMap;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.web.app.AlfrescoNavigationHandler;
|
||||
import org.alfresco.web.app.Application;
|
||||
import org.alfresco.web.app.servlet.FacesHelper;
|
||||
import org.alfresco.web.bean.repository.Node;
|
||||
import org.alfresco.web.data.IDataContainer;
|
||||
import org.alfresco.web.data.QuickSort;
|
||||
@@ -70,10 +71,10 @@ public class CreateContentWizard extends BaseContentWizard
|
||||
protected String content = null;
|
||||
protected List<SelectItem> createMimeTypes;
|
||||
|
||||
protected FormsService formsService;
|
||||
transient protected FormsService formsService;
|
||||
protected String formName;
|
||||
protected FormProcessor.Session formProcessorSession = null;
|
||||
protected Document instanceDataDocument = null;
|
||||
transient protected Document instanceDataDocument = null;
|
||||
|
||||
private static Log logger = LogFactory.getLog(CreateContentWizard.class);
|
||||
|
||||
@@ -86,9 +87,23 @@ public class CreateContentWizard extends BaseContentWizard
|
||||
this.formsService = formsService;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the formsService
|
||||
*/
|
||||
private FormsService getFormsService()
|
||||
{
|
||||
//check for null for cluster environment
|
||||
if (formsService == null)
|
||||
{
|
||||
formsService = (FormsService) FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), "FormsService");
|
||||
}
|
||||
return formsService;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
// Wizard implementation
|
||||
|
||||
|
||||
@Override
|
||||
public String finish()
|
||||
{
|
||||
@@ -294,7 +309,7 @@ public class CreateContentWizard extends BaseContentWizard
|
||||
*/
|
||||
public List<SelectItem> getFormsList()
|
||||
{
|
||||
Collection<Form> forms = this.formsService.getForms();
|
||||
Collection<Form> forms = this.getFormsService().getForms();
|
||||
List<SelectItem> items = new ArrayList<SelectItem>(forms.size()+1);
|
||||
items.add(new SelectItem("", ""));
|
||||
for (Form form : forms)
|
||||
@@ -317,7 +332,7 @@ public class CreateContentWizard extends BaseContentWizard
|
||||
public Form getForm() throws FormNotFoundException
|
||||
{
|
||||
return (this.getFormName() != null
|
||||
? formsService.getForm(formName)
|
||||
? getFormsService().getForm(formName)
|
||||
: null);
|
||||
}
|
||||
|
||||
|
@@ -45,6 +45,8 @@ import org.alfresco.web.ui.common.component.UIActionLink;
|
||||
|
||||
public class DocumentLinkDetailsDialog extends BaseDetailsBean implements NavigationSupport
|
||||
{
|
||||
private static final long serialVersionUID = 4716260640608281667L;
|
||||
|
||||
private static final String MSG_DETAILS_OF = "details_of";
|
||||
private static final String MSG_LOCATION = "location";
|
||||
private final static String MSG_CLOSE = "close";
|
||||
|
@@ -78,6 +78,7 @@ public class DocumentPropertiesDialog implements Serializable
|
||||
transient private NodeService nodeService;
|
||||
transient private FileFolderService fileFolderService;
|
||||
transient private DictionaryService dictionaryService;
|
||||
|
||||
protected BrowseBean browseBean;
|
||||
private List<SelectItem> contentTypes;
|
||||
private Node editableNode;
|
||||
|
@@ -38,14 +38,14 @@ import org.alfresco.web.bean.repository.Node;
|
||||
import org.alfresco.web.forms.Form;
|
||||
import org.alfresco.web.forms.FormNotFoundException;
|
||||
import org.alfresco.web.ui.common.Utils;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
/**
|
||||
* Bean implementation for the "Edit Content Wizard" dialog
|
||||
*/
|
||||
public class EditContentWizard extends CreateContentWizard
|
||||
{
|
||||
private static final long serialVersionUID = 1640754719164511019L;
|
||||
|
||||
private NodeRef nodeRef;
|
||||
private Form form;
|
||||
|
||||
|
@@ -43,6 +43,8 @@ import org.alfresco.web.ui.common.Utils;
|
||||
public class EditSimpleWorkflowDialog extends BaseDialogBean
|
||||
{
|
||||
|
||||
private static final long serialVersionUID = 7203447561571625990L;
|
||||
|
||||
private static final String MSG_ERROR_UPDATE_SIMPLEWORKFLOW = "error_update_simpleworkflow";
|
||||
|
||||
protected Map<String, Serializable> workflowProperties;
|
||||
|
Reference in New Issue
Block a user