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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
68140: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67633: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         67123: Merged changes from 4.1.6 and DEV:
            65930: MNT-11035: Site manager cannot cancel editing of a file which is being edited with Edit Online
               - Back to the previous implementation of ScriptNode#getIsLocked() method that was changed in MNT-8736. Also, the upload.post.js was corrected to allow new version upload operation for a locked working copy.
            65936: MNT-11035: Site manager cannot cancel editing of a file which is being edited with Edit Online
               - Fix build failure. Add required imports.
            67065: MNT-11036: Cancel Editing link does not appear for Edit Online
               - Unlock permission is required for "Cancel Editing" action, when a document is in "Edit Online" state.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68424 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-04-30 16:15:09 +00:00
parent a4891cca64
commit 00f38fb7c4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
View File

@@ -219,14 +219,15 @@ function main()
return;
}
if (updateNode.isLocked)
var workingcopy = updateNode.hasAspect("cm:workingcopy");
if (!workingcopy && updateNode.isLocked)
{
// We cannot update a locked document
// We cannot update a locked document (except working copy as per MNT-8736)
exitUpload(404, "Cannot update locked document '" + updateNodeRef + "', supply a reference to its working copy instead.");
return;
}
if (!updateNode.hasAspect("cm:workingcopy"))
if (!workingcopy)
{
// Ensure the file is versionable (autoVersion = true, autoVersionProps = false)
updateNode.ensureVersioningEnabled(true, false);