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

Change to the way we apply 'versionable' aspect by default to uploaded documents. Aspect is still applied but "autoversion" and "create initial version" features are off by default. First version is instead explicitly created during checkout process.

Browse Source 
Fix to apply 'versionable' aspect to documents that are being updated via the Share client but were initially uploaded via another route i.e. FTP or JSF Client.
Minor fix to doclist json to handle documents that have 'versionable' aspect applied but do not have any version history.
Code cleanup to ML document details.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-08-14 14:54:25 +00:00
parent f8d9ce1618
commit df0e09286b
3 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,33 +117,52 @@ function main()
if (updateNodeRef !== null && uploadDirectory === null)
{
// Update mode, since updateNodeRef was used
// Update existing file mode
var workingCopy = search.findNode(updateNodeRef);
if (workingCopy.isLocked)
{
// It's not a working copy, should have been the working copy, throw error
// We cannot update a locked document
status.code = 404;
status.message = "Cannot upload document since updateNodeRef '" + updateNodeRef + "' points to a locked document, supply a nodeRef to its working copy instead.";
status.message = "Cannot update locked document '" + updateNodeRef + "', supply a reference to its working copy instead.";
status.redirect = true;
return;
}
if (!workingCopy.hasAspect("cm:workingcopy"))
{
// It's not a working copy, do a check out to get the working copy
// Ensure the original file is versionable - may have been uploaded via different route
if (!workingCopy.hasAspect("cm:versionable"))
{
// Ensure the file is versionable - but do not autoversion or create initial version yet
var props = new Array(2);
props["cm:autoVersion"] = false;
props["cm:initialVersion"] = false;
workingCopy.addAspect("cm:versionable", props);
}
if (workingCopy.versionHistory == null)
{
// Create the first version manually so we have 1.0 before checkout
workingCopy.createVersion("", true);
}
// It's not a working copy, do a check out to get the actual working copy
workingCopy = workingCopy.checkout();
}
// Update the working copy
// Update the working copy content
workingCopy.properties.content.write(content);
// Reset working copy mimetype and encoding
workingCopy.properties.content.guessMimetype(filename);
workingCopy.properties.content.encoding = "UTF-8";
// check it in again, but with a version history note and as minor or major version increment
// check it in again, with supplied version history note
workingCopy = workingCopy.checkin(description, majorVersion);
model.document = workingCopy;
}
else if (uploadDirectory !== null && updateNodeRef === null)
{
// Upload file mode
var destNode = container;
if (uploadDirectory != "")
{
@@ -173,7 +192,7 @@ function main()
// Upload component was configured to find a new unique name for clashing filenames
var suffix = 1;
var tmpFilename;
while(existingFile !== null)
while (existingFile !== null)
{
tmpFilename = filename.substring(0, filename.lastIndexOf(".")) + "-" + suffix + filename.substring(filename.lastIndexOf("."));
existingFile = container.childByNamePath(uploadDirectory + tmpFilename);
@@ -187,15 +206,20 @@ function main()
var newFile = destNode.createFile(filename);
newFile.properties.contentType = contentType;
newFile.properties.content.write(content);
// Reapply mimetype as upload may have been via Flash - which always sends binary mimetype
newFile.properties.content.guessMimetype(filename);
newFile.properties.content.encoding = "UTF-8";
newFile.properties.title = title;
newFile.properties.description = description;
// Make file versionable (todo: check that this is ok depending on version store development)
newFile.addAspect("cm:versionable");
newFile.save();
// Ensure the file is versionable - but do not autoversion or create initial version
var props = new Array(2);
props["cm:autoVersion"] = false;
props["cm:initialVersion"] = false;
newFile.addAspect("cm:versionable", props);
// Create thumbnail?
if (thumbnailNames != null)
{
@@ -209,6 +233,7 @@ function main()
}
}
}
model.document = newFile;
}
else

16
config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/checkout.post.js
View File

@@ -29,6 +29,22 @@ function runAction(p_params)
return;
}
// Ensure the file is versionable - but do not autoversion or create initial version
if (!assetNode.hasAspect("cm:versionable"))
{
// Do not autoversion (we perform explicit checkout)
var props = new Array(2);
props["cm:autoVersion"] = false;
props["cm:initialVersion"] = false;
assetNode.addAspect("cm:versionable", props);
}
if (assetNode.versionHistory == null)
{
// Create the first version manually so we have 1.0 before checkout
assetNode.createVersion("", true);
}
// Checkout the asset
var workingCopy = assetNode.checkout();
if (workingCopy === null)

2
config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/doclist.get.json.ftl
View File

@@ -8,7 +8,7 @@
<#list doclist.items as item>
<#assign d = item.asset>
<#assign version = "1.0">
<#if d.hasAspect("cm:versionable")><#assign version = d.versionHistory?sort_by("versionLabel")?reverse[0].versionLabel></#if>
<#if d.hasAspect("cm:versionable") && d.versionHistory?size != 0><#assign version = d.versionHistory?sort_by("versionLabel")?reverse[0].versionLabel></#if>
<#if item.owner?exists>
<#assign lockedBy = (item.owner.properties.firstName + " " + item.owner.properties.lastName)?trim>
<#assign lockedByUser = item.owner.properties.userName>