mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merge of all UI clustering changes originally applied to 2.2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -99,7 +99,7 @@ public class CCCheckoutFileDialog extends CheckinCheckoutDialog
|
||||
// checkout to a arbituary parent Space
|
||||
NodeRef destRef = property.getSelectedSpaceId();
|
||||
|
||||
ChildAssociationRef childAssocRef = nodeService.getPrimaryParent(destRef);
|
||||
ChildAssociationRef childAssocRef = getNodeService().getPrimaryParent(destRef);
|
||||
workingCopyRef = property.getVersionOperationsService().checkout(node.getNodeRef(), destRef, ContentModel.ASSOC_CONTAINS, childAssocRef.getQName());
|
||||
}
|
||||
else
|
||||
@@ -120,8 +120,8 @@ public class CCCheckoutFileDialog extends CheckinCheckoutDialog
|
||||
NodeRef workflowPackage = (NodeRef) task.properties.get(WorkflowModel.ASSOC_PACKAGE);
|
||||
if (workflowPackage != null)
|
||||
{
|
||||
nodeService.addChild(workflowPackage, workingCopyRef, ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName
|
||||
.createValidLocalName((String) nodeService.getProperty(workingCopyRef, ContentModel.PROP_NAME))));
|
||||
getNodeService().addChild(workflowPackage, workingCopyRef, ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName
|
||||
.createValidLocalName((String) getNodeService().getProperty(workingCopyRef, ContentModel.PROP_NAME))));
|
||||
|
||||
if (logger.isDebugEnabled())
|
||||
logger.debug("Added working copy to workflow package: " + workflowPackage);
|
||||
@@ -162,7 +162,7 @@ public class CCCheckoutFileDialog extends CheckinCheckoutDialog
|
||||
// If a check-in rule is present in the space
|
||||
// the document was checked out to the working copy would have
|
||||
// already disappeared!
|
||||
if (this.nodeService.exists(property.getWorkingDocument().getNodeRef()))
|
||||
if (getNodeService().exists(property.getWorkingDocument().getNodeRef()))
|
||||
{
|
||||
// go to the page that allows the user to download the content
|
||||
// for editing
|
||||
|
Reference in New Issue
Block a user