mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V4.1-BUG-FIX to HEAD
43944: Fixes: ALF-16090: fixes view mode for control param showTime.
43964: Fixes: ALF-14758. Adds distinct styling for menus nested 4 levels or deeper to prevent confusion if there's an overlap.
44029: MNT-180 - Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
44040: Merged V3.4-BUF-GIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
44039: Minor changes to TransformerDebug to make output more readable when there are exceptions.
- NPE when there is no exception message
44046: MERGE DEV to V4.1-BUG-FIX
ALF-16562 : CIFS: Excel document version history lost after saving content in Excel:mac 2011 on Mac Mountain Lion
44115: Changes to standalone file state cache access mode checks to bring them into line with the clustered file state cache.
44160: Fix for ALF-13129, checks to see if the child association already exists on the versioned node. If it exists it doesn't add it again.
44239: ALF-16977: InstallerBuilder 8.5.1 2012-11-29 with layout fix from Bitrock
44319: Latest installer translations from Gloria
44343: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3)
44339: ALF-17070: Merged to V4.1 (4.1.2) from V4.1-BUG-FIX (3.4.12)
<< Regression introduced into 4.0.2 on 12/4/12 r35201 >>
44337: Merged DEV to V3.4-BUG-FIX (3.4.12)
44297: ALF-16935: wcm/avm file picker fails to render selection from folders navigation only works with 127.0.0.1 url
- Fix for regression from ALF-11956, connected with setting titles for file picker controls
44316: Merged DEV to V4.1
44094: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
Add WebDAV MOVE handling for case when backup is enabled in Mac 2011 Word
44285: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
Handle Mac 2011 Word backup in scope of RenameShuffle
44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr
- fix incremental cache state to cope with duplicate leaf/aux doc entries.
44283: Encoding fix by David Webster
44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr
- fix initial cache state to cope with duplicate leaf/aux doc entries.
44252: Russian fix from Gloria
44200: Probable fix for ALF-16895 SOLR: Cannot find files after restart and reindex solr
- still difficult to reproduce
44149: Merged HEAD to V4.1
44037: ALF-16947: prevent dependency to web-framework-commons war to be transitive: this artifact is not generated in Ant build
44039: Version in parent-pom was not changed properly when deploying to Maven repo
44142: ITALIAN: Translation update based on EN r43623, fixes ALF-16609
44107: ALF-16016, ALF-15991, ALF-16180: Russian fixes by Gloria
44078: ALF-16620: Out of memory Error applying CopiedFromAspectPatch
- CopiedFromAspectPatch.WorkProvider.getNextWork() was fetching discrete managable chunks
- and then blowing up as it continually fetched into the same in-memory HashSet!
44404: Merged DEV to V4.1-BUG-FIX
44378: ALF-16791 : resource bundle deployement for localization does not work with the dynamic approach
1. Split out MessageService message lookup methods into new interface MessageLookup that lives in DataModel
2. Added a simple implementation for SOLR to use
3. Made M2Label look up model labels via a supplied MessageLookup argument
4. Make DictionaryService extend MessageLookup so that it's easy to find a MessageLookup if you've got a DictionaryService
5. Accounted for interface changes throughout.
44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
- Not just Ghostscript but any thumbnail failure
44422: ALF-16123: "CheckOutCheckInService.checkout fails with DuplicateChildNodeNameException if no working copy label message found in current locale"
44424: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
44423: ALF-17114: Merged V4.1-BUG-FIX (4.1.3) to V4.1 (4.1.2)
- got the wrong branch
44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
- Not just Ghostscript but any thumbnail failure
44447: Merged V4.0.2 (4.0.0.22) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
<< Recording this as RECORD ONLY as it turns out the DEV code came form V4.1-BUG-FIX r42431 >>
44435: Merged DEV to V4.0.2 (4.0.2.22)
44429: MNT-232: Upgrade from 3.4.9 to 4.0.2 - FAILED
- Initialize rootRefs in the property definition to prevent NPE.
44468: Merged V3.4-PATCHES to V4.1-BUG-FIX
MNT-211 (Still needs implementing on 4.1)
44470: Fixes: ALF-16878 - don't use IE8's native JSON stringify method.
44511: ALF-16791: Added missing class.
44519: ALF-16791: Fixed broken unit tests
44541: Fix for ALF-17151 SOLR - add support to disable permission checks
44542: MNT-211 Re-implement on 4.1
44548: ALF-16791: Fixed broken SOLR
44559: ALF-17075: "Exporting and importing null MLText values does not work."
44577: Final part for ALF-16558 SOLR tracking does not do incremental updates but one single chunk
- fixed code so SolrSearchers are held for as little time as possible
44590: ALF-14523 (Share - Metadata constraint on workflow creation)
44594: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
44596: ALF-17075: "Exporting and importing null MLText values does not work." - change test name to something more meaningful
44599: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
44600: ALF-16791: Another omission not covered by unit tests
44603: ALF-14201: upgrade activiti to 5.7-20121211
44605: Added missing vti.server.url.path.prefix property required by commit 43471
Missing due to cherry picked commit, this is implemented as part of 39309 on HEAD.
44606: ALF-14201: upgrade activiti to 5.7-20121211 in Maven poms
44613: ALF-13690 (Share - It's possible to delete site groups via the UI)
44618: ALF-16939: "Error "importStatus.batchWeight is undefined" is thrown when Bulk Importer status webscript is run for XML format"
44621: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
44620: MNT-247: Merged DEV to PATCHES/V4.1.1 with corrections
44526: ALF-16964: Share alfrescoCookie connector fails when alfresco.authentication.allowGuestLogin=false, use case proxy between share and alfresco
Check if external authentication is active in BaseServlet
44628: Solution for ALF-3780 - Dashboard settings not deleted for deleted user.
Initial implementation by Dmitry Velichkevich.
Surf user config folder and user Surf dynamic component references are removed when user node is deleted via a Delete Node policy.
44632: addition of validation of NetworkFile isClosed property.
44648: Merge V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.3)
44566: ALF-17164: Add SVN revision in version.properties when building in continuous mode
44602: ALF-17164: adding the SCM revision in version.build so that it is displayed
also, sneak in the SVN path, so that tracability is complete
44650: BDE-111: Stop creating installers in parallel, it fails on pbld02. Also, revert to zip compression to gain build time
44651: ALF-14348 (Unable to update external blog configuration details)
44654: Merged DEV to V4.1-BUG-FIX
44614: ALF-17119: Possible UI bug - "$$" chars added to permissions for IMAP Attachments folder
Added a message bundles for FullControll access role.
44655: Merged DEV to V4.1-BUG-FIX
44593: ALF-14154: Encoding problem when open a file via webdav on Windows XP
Ignore user credentials for the OPTIONS request.
44612: ALF-14154 : Encoding problem when open a file via webdav on Windows XP
Ignore user credentials for the OPTIONS request.
44666: ALF-12001: Privacy: blog activities - activity is seen for draft blogs
- Wrong node was being used for access checks
- Fix by Andrey Chernov
44671: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters
- Now we can cope with a runAs where the username is in the wrong case
44296: ALF-17203 / ALF-17201 / MNT-216 : error saving versionable word documents
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
@@ -30,6 +30,8 @@ import java.util.Set;
|
||||
|
||||
import org.alfresco.model.ApplicationModel;
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.model.ForumModel;
|
||||
import org.alfresco.repo.content.MimetypeMap;
|
||||
import org.alfresco.repo.jscript.ScriptNode;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
@@ -41,6 +43,7 @@ import org.alfresco.service.cmr.coci.CheckOutCheckInService;
|
||||
import org.alfresco.service.cmr.model.FileFolderService;
|
||||
import org.alfresco.service.cmr.model.FileInfo;
|
||||
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
||||
import org.alfresco.service.cmr.repository.ContentData;
|
||||
import org.alfresco.service.cmr.repository.ContentReader;
|
||||
import org.alfresco.service.cmr.repository.ContentWriter;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
@@ -490,6 +493,97 @@ public class VersionServiceImplTest extends BaseVersionStoreTest
|
||||
//assertEquals("0.1", nodeService.getProperty(versionableNode, ContentModel.PROP_VERSION_LABEL));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Test reverting a node that has comments, see ALF-13129
|
||||
*/
|
||||
public void testRevertWithComments()
|
||||
{
|
||||
NodeRef versionableNode = createNewVersionableNode();
|
||||
|
||||
this.dbNodeService.setProperty(versionableNode, PROP_1, "I am before version");
|
||||
Version version1 = createVersion(versionableNode);
|
||||
this.dbNodeService.setProperty(versionableNode, PROP_1, "I am after version 1");
|
||||
|
||||
VersionHistory vh = this.versionService.getVersionHistory(versionableNode);
|
||||
assertNotNull(vh);
|
||||
assertEquals(1, vh.getAllVersions().size());
|
||||
|
||||
// Create a new version
|
||||
Version version2 = createVersion(versionableNode);
|
||||
|
||||
//Test a revert with no comments
|
||||
this.versionService.revert(versionableNode, version1);
|
||||
assertEquals("I am before version", this.dbNodeService.getProperty(versionableNode, PROP_1));
|
||||
|
||||
createComment(versionableNode, "my comment", "Do great work", false);
|
||||
assertTrue(nodeService.hasAspect(versionableNode, ForumModel.ASPECT_DISCUSSABLE));
|
||||
assertEquals(1, this.dbNodeService.getProperty(versionableNode, ForumModel.PROP_COMMENT_COUNT));
|
||||
|
||||
// Create a new version
|
||||
this.dbNodeService.setProperty(versionableNode, PROP_1, "I am version 3");
|
||||
Version version3 = createVersion(versionableNode);
|
||||
this.dbNodeService.setProperty(versionableNode, PROP_1, "I am after version 3");
|
||||
|
||||
createComment(versionableNode, "v3", "Great version", false);
|
||||
assertEquals(2, this.dbNodeService.getProperty(versionableNode, ForumModel.PROP_COMMENT_COUNT));
|
||||
|
||||
//Revert to a version that has comments.
|
||||
this.versionService.revert(versionableNode, version3);
|
||||
assertTrue(nodeService.hasAspect(versionableNode, ForumModel.ASPECT_DISCUSSABLE));
|
||||
assertEquals("I am version 3", this.dbNodeService.getProperty(versionableNode, PROP_1));
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was taken from the CommmentServiceImpl on the cloud branch
|
||||
*
|
||||
* TODO: When this is merged to HEAD, please remove this method and use the one in CommmentServiceImpl
|
||||
*/
|
||||
private NodeRef createComment(final NodeRef discussableNode, String title, String comment, boolean suppressRollups)
|
||||
{
|
||||
if(comment == null)
|
||||
{
|
||||
throw new IllegalArgumentException("Must provide a non-null comment");
|
||||
}
|
||||
|
||||
// There is no CommentService, so we have to create the node structure by hand.
|
||||
// This is what happens within e.g. comment.put.json.js when comments are submitted via the REST API.
|
||||
if (!nodeService.hasAspect(discussableNode, ForumModel.ASPECT_DISCUSSABLE))
|
||||
{
|
||||
nodeService.addAspect(discussableNode, ForumModel.ASPECT_DISCUSSABLE, null);
|
||||
}
|
||||
if (!nodeService.hasAspect(discussableNode, ForumModel.ASPECT_COMMENTS_ROLLUP) && !suppressRollups)
|
||||
{
|
||||
nodeService.addAspect(discussableNode, ForumModel.ASPECT_COMMENTS_ROLLUP, null);
|
||||
}
|
||||
// Forum node is created automatically by DiscussableAspect behaviour.
|
||||
NodeRef forumNode = nodeService.getChildAssocs(discussableNode, ForumModel.ASSOC_DISCUSSION, QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussion")).get(0).getChildRef();
|
||||
|
||||
final List<ChildAssociationRef> existingTopics = nodeService.getChildAssocs(forumNode, ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "Comments"));
|
||||
NodeRef topicNode = null;
|
||||
if (existingTopics.isEmpty())
|
||||
{
|
||||
Map<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
|
||||
props.put(ContentModel.PROP_NAME, "Comments");
|
||||
topicNode = nodeService.createNode(forumNode, ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "Comments"), ForumModel.TYPE_TOPIC, props).getChildRef();
|
||||
}
|
||||
else
|
||||
{
|
||||
topicNode = existingTopics.get(0).getChildRef();
|
||||
}
|
||||
|
||||
NodeRef postNode = nodeService.createNode(topicNode, ContentModel.ASSOC_CONTAINS, ContentModel.ASSOC_CONTAINS, ForumModel.TYPE_POST).getChildRef();
|
||||
nodeService.setProperty(postNode, ContentModel.PROP_CONTENT, new ContentData(null, MimetypeMap.MIMETYPE_TEXT_PLAIN, 0L, null));
|
||||
nodeService.setProperty(postNode, ContentModel.PROP_TITLE, title);
|
||||
ContentWriter writer = contentService.getWriter(postNode, ContentModel.PROP_CONTENT, true);
|
||||
writer.setMimetype(MimetypeMap.MIMETYPE_HTML);
|
||||
writer.setEncoding("UTF-8");
|
||||
writer.putContent(comment);
|
||||
|
||||
return postNode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Test reverting from Share
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user