Fix for ALF-10826

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2011-12-15 18:09:53 +00:00
parent beb261ed4e
commit bf7181452c
23 changed files with 3023 additions and 2349 deletions

View File

@@ -33,6 +33,7 @@ import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.importer.view.NodeContext;
import org.alfresco.repo.model.filefolder.HiddenAspect;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.security.authentication.AuthenticationContext;
import org.alfresco.repo.version.Version2Model;
@@ -108,6 +109,7 @@ public class ImporterComponent
private AuthenticationContext authenticationContext;
private OwnableService ownableService;
private VersionService versionService;
private HiddenAspect hiddenAspect;
/**
* The db node service, used when updating the version store.
@@ -236,6 +238,11 @@ public class ImporterComponent
this.dbNodeService = nodeService;
}
public void setHiddenAspect(HiddenAspect hiddenAspect)
{
this.hiddenAspect = hiddenAspect;
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.view.ImporterService#importView(java.io.InputStreamReader, org.alfresco.service.cmr.view.Location, java.util.Properties, org.alfresco.service.cmr.view.ImporterProgress)
*/
@@ -611,6 +618,9 @@ public class ImporterComponent
}
}
// check whether the node should be hidden
hiddenAspect.checkHidden(nodeRef);
// import content, if applicable
for (Map.Entry<QName,Serializable> property : context.getProperties().entrySet())
{