mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-15 15:02:20 +00:00
Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
125148 bhorje: ACE-5307 the title property remains unset for smart virtual folders git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@125250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -649,8 +649,6 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
|
|||||||
properties.put(ContentModel.PROP_LOCALE,
|
properties.put(ContentModel.PROP_LOCALE,
|
||||||
Locale.UK.toString());
|
Locale.UK.toString());
|
||||||
|
|
||||||
properties.put(ContentModel.PROP_TITLE,
|
|
||||||
folderDefinition.getName());
|
|
||||||
|
|
||||||
properties.put(ContentModel.PROP_MODIFIED,
|
properties.put(ContentModel.PROP_MODIFIED,
|
||||||
new Date());
|
new Date());
|
||||||
@@ -666,6 +664,7 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
|
|||||||
|
|
||||||
properties.put(ContentModel.PROP_DESCRIPTION,
|
properties.put(ContentModel.PROP_DESCRIPTION,
|
||||||
folderDefinition.getDescription());
|
folderDefinition.getDescription());
|
||||||
|
// ACE-5303 : ContentModel.PROP_TITLE remains unset
|
||||||
|
|
||||||
// We add virtual folder definition structure properties. They might
|
// We add virtual folder definition structure properties. They might
|
||||||
// override the above defaults.
|
// override the above defaults.
|
||||||
|
@@ -317,7 +317,6 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements
|
|||||||
List<QName> mandatoryProperties = Arrays.asList(ContentModel.PROP_STORE_IDENTIFIER,
|
List<QName> mandatoryProperties = Arrays.asList(ContentModel.PROP_STORE_IDENTIFIER,
|
||||||
ContentModel.PROP_STORE_PROTOCOL,
|
ContentModel.PROP_STORE_PROTOCOL,
|
||||||
ContentModel.PROP_LOCALE,
|
ContentModel.PROP_LOCALE,
|
||||||
ContentModel.PROP_TITLE,
|
|
||||||
ContentModel.PROP_MODIFIED,
|
ContentModel.PROP_MODIFIED,
|
||||||
ContentModel.PROP_MODIFIER,
|
ContentModel.PROP_MODIFIER,
|
||||||
ContentModel.PROP_CREATED,
|
ContentModel.PROP_CREATED,
|
||||||
@@ -331,6 +330,8 @@ public abstract class VirtualizationIntegrationTest extends TestCase implements
|
|||||||
assertTrue("Mandatory properties are missing" + missingPropreties,
|
assertTrue("Mandatory properties are missing" + missingPropreties,
|
||||||
missingPropreties.isEmpty());
|
missingPropreties.isEmpty());
|
||||||
|
|
||||||
|
assertFalse("ACE-5303 : ContentModel.PROP_TITLE should remain unset",nodeProperties.containsKey(ContentModel.PROP_TITLE));
|
||||||
|
|
||||||
Set<Entry<QName, Serializable>> epEntries = expectedProperties.entrySet();
|
Set<Entry<QName, Serializable>> epEntries = expectedProperties.entrySet();
|
||||||
StringBuilder unexpectedBuilder = new StringBuilder();
|
StringBuilder unexpectedBuilder = new StringBuilder();
|
||||||
for (Entry<QName, Serializable> entry : epEntries)
|
for (Entry<QName, Serializable> entry : epEntries)
|
||||||
|
Reference in New Issue
Block a user