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

ALF-10902 : No friendly notification occurs when Editor or Collaborator tries to delete content

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31363 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2011-10-19 15:55:01 +00:00
parent 3c079c5983
commit 912e873620
13 changed files with 359 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
source/java/org/alfresco/filesys/repo/NonTransactionalRuleContentDiskDriver.java
View File

@@ -178,29 +178,9 @@ public class NonTransactionalRuleContentDiskDriver implements ExtendedDiskInterf
{
if(logger.isDebugEnabled())
{
int sharedAccess = params.getSharedAccess();
String strSharedAccess = "none";
switch(sharedAccess)
{
case SharingMode.NOSHARING:
strSharedAccess = "nosharing";
break;
case SharingMode.READ:
strSharedAccess = "read";
break;
case SharingMode.WRITE:
strSharedAccess = "write";
break;
case SharingMode.READWRITE:
strSharedAccess = "read-write";
break;
case SharingMode.DELETE:
strSharedAccess = "delete";
break;
}
int sharedAccess = params.getSharedAccess();
String strSharedAccess = SharingMode.getSharingModeAsString(sharedAccess);
logger.debug("createFile:" + params.getPath()
+ ", isDirectory: " + params.isDirectory()
+ ", isStream: " + params.isStream()
@@ -219,8 +199,6 @@ public class NonTransactionalRuleContentDiskDriver implements ExtendedDiskInterf
ContentContext tctx = (ContentContext) tree.getContext();
NodeRef rootNode = tctx.getRootNode();
String[] paths = FileName.splitPath(params.getPath());
String folder = paths[0];
String file = paths[1];
@@ -235,7 +213,6 @@ public class NonTransactionalRuleContentDiskDriver implements ExtendedDiskInterf
if(ret != null && ret instanceof NetworkFile)
{
return (NetworkFile)ret;
}
else
@@ -309,27 +286,8 @@ public class NonTransactionalRuleContentDiskDriver implements ExtendedDiskInterf
if(logger.isDebugEnabled())
{
int sharedAccess = param.getSharedAccess();
String strSharedAccess = "none";
switch(sharedAccess)
{
case SharingMode.NOSHARING:
strSharedAccess = "nosharing";
break;
case SharingMode.READ:
strSharedAccess = "read";
break;
case SharingMode.WRITE:
strSharedAccess = "write";
break;
case SharingMode.READWRITE:
strSharedAccess = "read-write";
break;
case SharingMode.DELETE:
strSharedAccess = "delete";
break;
}
String strSharedAccess = SharingMode.getSharingModeAsString(sharedAccess);
logger.debug("openFile:" + path
+ ", isDirectory: " + param.isDirectory()
+ ", isStream: " + param.isStream()
@@ -358,32 +316,50 @@ public class NonTransactionalRuleContentDiskDriver implements ExtendedDiskInterf
EvaluatorContext ctx = getEvaluatorContext(driverState, folder);
// Todo what about attributes only and writeOnly ?
OpenFileMode writeAccess = param.isReadWriteAccess() ? OpenFileMode.WRITE : OpenFileMode.READ ;
// Todo what about attributes only ?
if(param.isDeleteOnClose())
OpenFileMode openMode = OpenFileMode.READ_WRITE;
if(param.isAttributesOnlyAccess())
{
openMode = OpenFileMode.ATTRIBUTES_ONLY;
}
else if (param.isReadWriteAccess())
{
openMode = OpenFileMode.READ_WRITE;
}
else if (param.isWriteOnlyAccess())
{
openMode = OpenFileMode.WRITE_ONLY;
}
else if (param.isReadOnlyAccess())
{
openMode = OpenFileMode.READ_ONLY;
}
else if(param.isDeleteOnClose())
{
if(logger.isDebugEnabled())
{
logger.debug("open file has delete on close");
}
writeAccess = OpenFileMode.DELETE;
openMode = OpenFileMode.DELETE;
}
boolean truncate = param.isOverwrite();
Operation o = new OpenFileOperation(file, writeAccess, truncate, rootNode, path);
Operation o = new OpenFileOperation(file, openMode, truncate, rootNode, path);
Command c = ruleEvaluator.evaluate(ctx, o);
Object ret = commandExecutor.execute(sess, tree, c);
if(ret != null && ret instanceof NetworkFile)
{
NetworkFile x = (NetworkFile)ret;
if(logger.isDebugEnabled())
{
logger.debug("returning open file: for path:" + path +", ret:" + ret);
}
return (NetworkFile)ret;
return x;
}
else
{