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

Merged BRANCHES/V3.4 to HEAD:

Browse Source 
24065: Fix for ALF-5064: Overriding the config for a form with an edit-form defined appears to lose knowledge of the custom form
   24471: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_29 to BRANCHES/V3.4:
        24361: ALF-6033: Sharepoint broken on Vista.
   24548: Fix for ALF-6110:Checking out doсument's via MS Office leads to incorrect displaying of document's metadata and for ALF-6113: MP3 files cause an error when viewing the Document Details page
   24601: Fix for ALF-6032: It's impossible to create meeting items

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2011-01-17 15:04:37 +00:00
parent bf2f851d88
commit ee6510a627
2 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/repo/webdav/LockMethod.java
View File

@@ -389,33 +389,14 @@ public class LockMethod extends WebDAVMethod
xml.startDocument();
// Output the lock details
String nsdec = generateNamespaceDeclarations(null);
xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROP + nsdec, WebDAV.XML_NS_PROP + nsdec, getDAVHelper().getNullAttributes());
if (WebDAV.AGENT_MS_6_1_7600.equals(m_userAgent))
{
xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROP + nsdec, WebDAV.XML_NS_PROP + nsdec, getDAVHelper().getNullAttributes());
// Output the lock details
generateLockDiscoveryXML(xml, lockNode, false, scope, WebDAV.getDepthName(m_depth), lt, owner);
// Output the lock details
generateLockDiscoveryXML(xml, lockNode, false, scope, WebDAV.getDepthName(m_depth), lt, owner);
// Close off the XML
xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP);
}
else
{
xml.startElement(EMPTY_NS, WebDAV.XML_PROP + nsdec, WebDAV.XML_PROP + nsdec, getDAVHelper().getNullAttributes());
// Output the lock details
generateLockDiscoveryXML(xml, lockNode, true, scope, WebDAV.getDepthName(m_depth), lt, owner);
// Close off the XML
xml.endElement(EMPTY_NS, WebDAV.XML_PROP, WebDAV.XML_PROP);
}
// Send the XML back to the client
flushXML(xml);
// Close off the XML
xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP);
}
/**
@@ -451,6 +432,4 @@ public class LockMethod extends WebDAVMethod
return ns.toString();
}
}

4
source/java/org/alfresco/repo/webdav/WebDAV.java
View File

@@ -123,10 +123,6 @@ public class WebDAV
// If header keyword
public static final String HEADER_KEY_NOT = "Not";
// User agents
public static final String AGENT_MS_6_1_7600 = "Microsoft-WebDAV-MiniRedir/6.1.7600";
// General string constants