mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.1 to HEAD
6408: removing the avmsubmittedaspect 6409: reintroducing the avmclearsubmittedhandler as a stub in order to keep inflight workflows operating properly. 6412: Fix to a subtle navigation issue when browsing WCM projects. 6415: WCM-678 - Page size WCM browse screens 6417: Fixes WCM-556, WCM-557, WCM-618 & WCM-620 Line endings change -- manual merge Manual 'root\projects\web-client\config\alfresco\messages\webclient.properties' git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -35,7 +35,6 @@ import javax.transaction.UserTransaction;
|
||||
|
||||
import org.alfresco.model.WCMModel;
|
||||
import org.alfresco.repo.avm.AVMNodeConverter;
|
||||
import org.alfresco.repo.avm.wf.AVMSubmittedAspect;
|
||||
import org.alfresco.sandbox.SandboxConstants;
|
||||
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
|
||||
import org.alfresco.service.cmr.avmsync.AVMDifference;
|
||||
@@ -62,7 +61,6 @@ public class ManageChangeRequestTaskDialog extends ManageTaskDialog
|
||||
{
|
||||
protected boolean doResubmitNow = false;
|
||||
protected AVMBrowseBean avmBrowseBean;
|
||||
protected AVMSubmittedAspect avmSubmittedAspect;
|
||||
|
||||
private final static Log logger = LogFactory.getLog(ManageChangeRequestTaskDialog.class);
|
||||
|
||||
@@ -189,15 +187,6 @@ public class ManageChangeRequestTaskDialog extends ManageTaskDialog
|
||||
this.avmBrowseBean = avmBrowseBean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the avm submitted aspect service to use
|
||||
*
|
||||
* @param avmSubmittedAspect AVMSubmittedAspect instance
|
||||
*/
|
||||
public void setAvmSubmittedAspect(AVMSubmittedAspect avmSubmittedAspect)
|
||||
{
|
||||
this.avmSubmittedAspect = avmSubmittedAspect;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------
|
||||
// Helper methods
|
||||
|
Reference in New Issue
Block a user