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

57640: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57627: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57566: Reverse Merged: Appears to have caused build failures https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV41BUGFIX-829
            57419: Merged DEV to V4.1-BUG-FIX (4.1.8)
               MNT-9794: Authorities with duplicate names can be easilly created using AuthorityService
                  - ContentModel.PROP_NAME was added for preventing the generation of new uid for every new authority nodes with the duplicated names in 'child_node_name' field into 'alf_child_assoc' table.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 21:21:07 +00:00
parent 881e324c76
commit c791da212f
2 changed files with 1 additions and 23 deletions

View File

@@ -377,9 +377,6 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
public void createAuthority(String name, String authorityDisplayName, Set<String> authorityZones)
{
HashMap<QName, Serializable> props = new HashMap<QName, Serializable>();
//MNT-9794 fix. ContentModel.PROP_NAME is added for preventing the generation of new uid for every new authority
// nodes with the duplicated names in 'child_node_name' field into 'alf_child_assoc' table
props.put(ContentModel.PROP_NAME, name);
props.put(ContentModel.PROP_AUTHORITY_NAME, name);
props.put(ContentModel.PROP_AUTHORITY_DISPLAY_NAME, authorityDisplayName);
NodeRef childRef;