mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD
43598: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX *RECORD ONLY*
41906: ALF-11378: REST API has been modified to return extra information about a user whether s/he belongs to a group or not.
44003: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_22 to BRANCHES/DEV/V4.1-BUG-FIX:
ALF-15210: Inconsistency in the '?' icon over the dashlets projects\slingshot\source\web\js\share.js DashletTitleBarActions_onReady() function was updated. Fix initialize the style for actionsNode elements into the DOM for IE.
44004: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_22 to V4.1-BUG-FIX:
ALF-15793: edit offline hides version history projects\slingshot\source\web\components\document-details\document-actions.js onActionUploadNewVersion function was updated. Fix sets version variable correctly now using asset.workingCopy property instead asset.custom property, which is undefined.
44018: ALF-16540 : CMIS: createDocument with VersioningState.CHECKEDOUT causes NodeLockedException for types with mandatory versionable aspect
The ckeck for lock was disabled when beforeCreateVersion policy is handled.
Version could be created for a locked node.
44054: Fix for ALF-16337. Datalist assignee not searchable by full name.
44056: Trivial change. Fixing some compiler warnings under org.alfresco.repo.content.metadata including a noisy Tika one.
44143: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_19 to BRANCHES/DEV/V4.1-BUG-FIX:
42989: ALF-16331: Wrong user for "completed by" information provided in Group Review And Approve workflow
44147: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX:
44146: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2012_05_22 to BRANCHES/DEV/V3.4-BUG-FIX:
37733: ALF-12051: Webdav - Cannot open files containing "?" character in the filename in WinXP
44152: ALF-17009 : Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
44151: ALF-14035 Tiny HTML file that causes Jodconverter to launch a 100% CPU soffice instance
- HTML to PDF is now done via ODT as the direct transform hangs if there are <sub> tags in the HTML.
- Added in 'unsupportedTransformations' to stop a bare transformer.JodConverter from doing HTML to PDF
- TransformerDebug test file debugTransformers.txt no longer needs to be 18 bytes, as it made it too fiddly.
- Modified debug from RuntimeExec so less editing is required to running from the command line
- Removed tabs that had been added to enterprise/content-services-context.xml in 4.1-BUG-FIX
44192: ALF-16560 - CIFS: Word document version history lost after saving content in Word:mac 2011 on Mac Mountain Lion
44224: ALF-16896 Exception with TIKA meta data extractor.
- Patch POI to handle parsing of Unicode properties that starts on a 4 byte boundary
rather than the specified offset. Example file was created using http://www.aspose.com/
44241: Merged DEV to V4.1-BUG-FIX
44208: ALF-14591 : Ordering not supported for IMAP properties defining IMAP sort fields in Share
Make properties from imap:imapContent aspect indexable for SOLR.
44253: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/V4.1-BUG-FIX:
38927: CLOUD-128 - Update rules works incorrectly
This is a partial fix for ALF-14568. The rest is coming in a separate check-in.
I made some minor adjustments to this change - trivial spelling fix and whitespace changes.
44257: ALF-16563 - CIFS: Image document version history lost after saving content in Preview on Mac Mountain Lion
44260: Fix for ALF-16430 - List of values shown in alphabetical order in Share Forms. Values now only sorted if the Forms config 'field' element has the sorted='true' attribute.
44269: Completion of fix for ALF-14568 - Update rule works incorrectly.
44318: Fix for ALF-17055 - remoteadm webscript set a Last-Modified HTTP header whose date format does not conform to RFC 2616 hence breaking proxy caching
44320: Fix for ALF-16463 - documentLibrary RSS feed does not pass the w3c validator, in particular pubDate breaks RFC-822, date not displayed when using non English locale
44352: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_12 to BRANCHES/DEV/V4.1-BUG-FIX
43860: ALF-16263: Search using a "Stop Word" not displaying any result
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44459 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
@@ -1505,7 +1505,14 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD
|
||||
// Inhibit versioning for this transaction
|
||||
getPolicyFilter().disableBehaviour( ContentModel.ASPECT_VERSIONABLE);
|
||||
|
||||
// Check if the file is being marked for deletion, if so then check if the file is locked
|
||||
// Check if the file is being marked for deletion, if so then check if the file is locked
|
||||
|
||||
/*
|
||||
* Which DeleteOnClose flag has priority?
|
||||
* SetDeleteOnClose is not set or used in this method.
|
||||
* The NTProtocolHandler sets the deleteOnClose in both
|
||||
* info and the NetworkFile - it's the one in NetworkFile that results in the file being deleted.
|
||||
*/
|
||||
if ( info.hasSetFlag(FileInfo.SetDeleteOnClose) && info.hasDeleteOnClose())
|
||||
{
|
||||
if(logger.isDebugEnabled())
|
||||
@@ -1542,6 +1549,8 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD
|
||||
throw new DirectoryNotEmptyException( name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if(info.hasSetFlag(FileInfo.SetAttributes))
|
||||
@@ -1618,10 +1627,7 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD
|
||||
// Set the creation and modified date/time
|
||||
Map<QName, Serializable> auditableProps = new HashMap<QName, Serializable>(5);
|
||||
|
||||
// Which DeleteOnClose flag has priority?
|
||||
// SetDeleteOnClose is not set or used in this method.
|
||||
// The NTProtocolHandler sets the deleteOnClose in both
|
||||
// info and the NetworkFile - it's the one in NetworkFile that works.
|
||||
|
||||
|
||||
if ( info.hasSetFlag(FileInfo.SetCreationDate) && info.hasCreationDateTime())
|
||||
{
|
||||
@@ -2725,8 +2731,9 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD
|
||||
* Close the file.
|
||||
*
|
||||
* @exception java.io.IOException If an error occurs.
|
||||
* @return node ref of deleted file
|
||||
*/
|
||||
public void closeFile(NodeRef rootNode, String path, NetworkFile file) throws IOException
|
||||
public NodeRef closeFile(NodeRef rootNode, String path, NetworkFile file) throws IOException
|
||||
{
|
||||
if ( logger.isDebugEnabled())
|
||||
{
|
||||
@@ -2736,7 +2743,7 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD
|
||||
if( file instanceof PseudoNetworkFile)
|
||||
{
|
||||
file.close();
|
||||
return;
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2744,13 +2751,15 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD
|
||||
*/
|
||||
if(file.hasDeleteOnClose())
|
||||
{
|
||||
NodeRef target = null;
|
||||
|
||||
if(logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("closeFile has delete on close set path:" + path);
|
||||
}
|
||||
try
|
||||
{
|
||||
NodeRef target = getCifsHelper().getNodeRef(rootNode, path);
|
||||
target = getCifsHelper().getNodeRef(rootNode, path);
|
||||
if(target!=null)
|
||||
{
|
||||
nodeService.deleteNode(target);
|
||||
@@ -2774,7 +2783,7 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD
|
||||
logger.debug("Closed file: network file=" + file + " delete on close=" + file.hasDeleteOnClose());
|
||||
}
|
||||
|
||||
return;
|
||||
return target;
|
||||
}
|
||||
|
||||
// Check for a temp file - which will be a new file or a read/write file
|
||||
@@ -2890,6 +2899,8 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD
|
||||
logger.debug(" File " + file.getFullName() + ", version=" + nodeService.getProperty( cFile.getNodeRef(), ContentModel.PROP_VERSION_LABEL));
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user