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

70685: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69750: ACE-848: Added ALFRESCO_SEARCH_ADMINISTRATORS group as well as a patch.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Draper
2014-05-19 12:50:54 +00:00
parent 1b5a5dd2ec
commit dcdfa645c1
6 changed files with 70 additions and 5 deletions

View File

@@ -43,6 +43,16 @@
<cm:authorityName>GROUP_SITE_ADMINISTRATORS</cm:authorityName>
</view:properties>
</cm:authorityContainer>
<cm:authorityContainer view:childName="cm:GROUP_ALFRESCO_SEARCH_ADMINISTRATORS">
<view:aspects>
<sys:referenceable />
</view:aspects>
<view:properties>
<sys:node-uuid>GROUP_ALFRESCO_SEARCH_ADMINISTRATORS</sys:node-uuid>
<cm:name>GROUP_ALFRESCO_SEARCH_ADMINISTRATORS</cm:name>
<cm:authorityName>GROUP_ALFRESCO_SEARCH_ADMINISTRATORS</cm:authorityName>
</view:properties>
</cm:authorityContainer>
</sys:children>
</view:associations>
</sys:container>
@@ -80,6 +90,11 @@
view:pathref="${system.authorities_container.childname}/cm:GROUP_SITE_ADMINISTRATORS"
view:childName="cm:GROUP_SITE_ADMINISTRATORS" />
</cm:inZone>
<cm:inZone>
<view:reference
view:pathref="${system.authorities_container.childname}/cm:GROUP_ALFRESCO_SEARCH_ADMINISTRATORS"
view:childName="cm:GROUP_ALFRESCO_SEARCH_ADMINISTRATORS" />
</cm:inZone>
</view:associations>
</cm:zone>
<cm:zone view:childName="cm:APP.DEFAULT">
@@ -106,6 +121,11 @@
view:pathref="${system.authorities_container.childname}/cm:GROUP_SITE_ADMINISTRATORS"
view:childName="cm:GROUP_SITE_ADMINISTRATORS" />
</cm:inZone>
<cm:inZone>
<view:reference
view:pathref="${system.authorities_container.childname}/cm:GROUP_ALFRESCO_SEARCH_ADMINISTRATORS"
view:childName="cm:GROUP_ALFRESCO_SEARCH_ADMINISTRATORS" />
</cm:inZone>
</view:associations>
</cm:zone>
</sys:children>

View File

@@ -25,6 +25,14 @@
</cm:member>
</view:associations>
</view:reference>
<view:reference view:pathref="${system.authorities_container.childname}/cm:GROUP_ALFRESCO_SEARCH_ADMINISTRATORS">
<view:associations>
<cm:member>
<view:reference view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.adminusername}"
view:childName="cm:${alfresco_user_store.adminusername}" />
</cm:member>
</view:associations>
</view:reference>
<view:reference view:pathref="${system.zones_container.childname}/cm:AUTH.ALF">
<view:associations>
<cm:inZone>