mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged DEV/WCM_SERVICES to HEAD
12099: WCM Services - "sandbox service" - add relative path support git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -51,7 +51,6 @@ import org.alfresco.repo.web.scripts.FileTypeImageUtils;
|
||||
import org.alfresco.repo.workflow.WorkflowModel;
|
||||
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
|
||||
import org.alfresco.service.cmr.avm.AVMService;
|
||||
import org.alfresco.service.cmr.avm.locking.AVMLockingService;
|
||||
import org.alfresco.service.cmr.avmsync.AVMDifference;
|
||||
import org.alfresco.service.cmr.avmsync.AVMSyncService;
|
||||
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
|
||||
@@ -133,7 +132,6 @@ public class SubmitDialog extends BaseDialogBean
|
||||
transient private AVMService avmService;
|
||||
transient private WorkflowService workflowService;
|
||||
transient private AVMSyncService avmSyncService;
|
||||
transient private AVMLockingService avmLockingService;
|
||||
transient private FormsService formsService;
|
||||
transient private SandboxFactory sandboxFactory;
|
||||
transient private SandboxService sandboxService;
|
||||
@@ -180,23 +178,6 @@ public class SubmitDialog extends BaseDialogBean
|
||||
return this.avmSyncService;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param avmLockingService The AVMLockingService to set
|
||||
*/
|
||||
public void setAvmLockingService(AVMLockingService avmLockingService)
|
||||
{
|
||||
this.avmLockingService = avmLockingService;
|
||||
}
|
||||
|
||||
protected AVMLockingService getAvmLockingService()
|
||||
{
|
||||
if (this.avmLockingService == null)
|
||||
{
|
||||
this.avmLockingService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getAVMLockingService();
|
||||
}
|
||||
return this.avmLockingService;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param avmBrowseBean The AVM BrowseBean to set
|
||||
*/
|
||||
@@ -509,7 +490,7 @@ public class SubmitDialog extends BaseDialogBean
|
||||
String submitLabel = this.label;
|
||||
String submitComment = this.comment;
|
||||
|
||||
getSandboxService().submitList(sbStoreId, nodes, this.expirationDates, submitLabel, submitComment);
|
||||
getSandboxService().submitListNodes(sbStoreId, nodes, this.expirationDates, submitLabel, submitComment);
|
||||
|
||||
// if we get this far return the default outcome
|
||||
return this.getDefaultFinishOutcome();
|
||||
|
Reference in New Issue
Block a user