inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:

Browse Source 
35606: Merged BRANCHES/V3.4 to BRANCHES/DEV/V4.0-BUG-FIX:
        35375: Fix for ALF-13711: "Hidden Aspect applied to Mac powepoint files."
             - re-instated previous hidden aspect behaviour
        - also make sure the HiddenAspectTest runs

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2012-04-24 11:45:30 +00:00
parent fa1f4c3276
commit f71280b165
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/model/filefolder/FilenameFilteringInterceptor.java
View File

@@ -248,7 +248,6 @@ public class FilenameFilteringInterceptor implements MethodInterceptor
{ {
ret = invocation.proceed(); ret = invocation.proceed();
FileInfoImpl fileInfo = (FileInfoImpl)ret; FileInfoImpl fileInfo = (FileInfoImpl)ret;
checkTemporaryAspect(temporaryFiles.isFiltered(filename), fileInfo); checkTemporaryAspect(temporaryFiles.isFiltered(filename), fileInfo);
@@ -265,20 +264,20 @@ public class FilenameFilteringInterceptor implements MethodInterceptor
// Name is changing // Name is changing
// check against all the regular expressions // check against all the regular expressions
checkTemporaryAspect(temporaryFiles.isFiltered(newName), sourceNodeRef); checkTemporaryAspect(temporaryFiles.isFiltered(newName), sourceNodeRef);
}
// now do the move
ret = invocation.proceed();
if(getMode() == Mode.ENHANCED) if(getMode() == Mode.ENHANCED)
{ {
hiddenAspect.checkHidden(sourceNodeRef, true); hiddenAspect.checkHidden(sourceNodeRef, true);
} }
} }
// now do the move
ret = invocation.proceed();
}
else if (methodName.startsWith("copy")) else if (methodName.startsWith("copy"))
{ {
ret = invocation.proceed(); ret = invocation.proceed();
FileInfoImpl fileInfo = (FileInfoImpl) ret; FileInfoImpl fileInfo = (FileInfoImpl) ret;
String filename = fileInfo.getName(); String filename = fileInfo.getName();
@@ -317,13 +316,14 @@ public class FilenameFilteringInterceptor implements MethodInterceptor
// check against all the regular expressions // check against all the regular expressions
checkTemporaryAspect(temporaryFiles.isFiltered(newName), sourceNodeRef); checkTemporaryAspect(temporaryFiles.isFiltered(newName), sourceNodeRef);
ret = invocation.proceed();
if(getMode() == Mode.ENHANCED) if(getMode() == Mode.ENHANCED)
{ {
hiddenAspect.checkHidden(sourceNodeRef, true); hiddenAspect.checkHidden(sourceNodeRef, true);
} }
ret = invocation.proceed();
return ret; return ret;
} }
else else