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

64838: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64768: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2)
         64759: Merged V4.1.8 (4.1.8) to V4.1-BUG-FIX (4.1.9)
            64700: MNT-10868: Merged DEV to PATCHES/V4.1.8.
               63876: MNT-10868 CMIS: Incorrect value of Latest Major version on Versions and Properties tabs.
                  - Fixed the isLatestMajorVersion() implementation to return false if the version of the doc is minor.
               64372: MNT-10868 CMIS: Incorrect value of Latest Major version on Versions and Properties tabs.
                  - In CMISTest was added testIsLatestMajorVersion test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-04-02 20:05:42 +00:00
parent dd247ae264
commit 68474ade51
2 changed files with 111 additions and 2 deletions

View File

@@ -628,8 +628,10 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
{
// ALF-11116: the current node (in the main store) and the frozen node (in the version store) are both represented as CMISNodeInfos
// but are indistinguishable apart from their storeRef (their objectVariant can be the same).
isLatestMajorVersion = (nodeRef.getStoreRef().getIdentifier().equals(Version2Model.STORE_ID) || nodeRef.getStoreRef().getIdentifier().equals(VersionModel.STORE_ID)) ?
currentVersion.getFrozenStateNodeRef().equals(nodeRef) : currentVersion.getVersionedNodeRef().equals(nodeRef);
if (nodeRef.getStoreRef().getIdentifier().equals(Version2Model.STORE_ID) || nodeRef.getStoreRef().getIdentifier().equals(VersionModel.STORE_ID))
{
isLatestMajorVersion = currentVersion.getFrozenStateNodeRef().equals(nodeRef);
}
break;
}
currentVersion = versionHistory.getPredecessor(currentVersion);