Merged BRANCHES/V2.3 to HEAD:

95749: RM-1800 (Transfers are not displayed for non-rm-admin users)
   95782: Merged BRANCHES/V2.3.COMMUNITY to BRANCHES/V2.3:
        95781: RM-1872 (2.3 New Feature Icons)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@95784 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml

@@ -52,16 +52,6 @@
           class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.FillingCapabilityCondition">
     </bean>
 
-    <bean id="capabilityCondition.fillingOnChildren"
-          parent="capabilityCondition.base"
-          class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.FillingOnChildrenCapabilityCondition">
-    </bean>
-
-    <bean id="capabilityCondition.readOnChildren"
-          parent="capabilityCondition.base"
-          class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.ReadOnChildrenCapabilityCondition">
-    </bean>
-
     <bean id="capabilityCondition.transferred"
           parent="capabilityCondition.base"
           class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.TransferredCapabilityCondition">

rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml

@@ -209,7 +209,6 @@
       <property name="kinds" value="TRANSFER"/>
       <property name="conditions">
          <map>
-            <entry key="capabilityCondition.fillingOnChildren" value="true"/>
             <entry key="capabilityCondition.isTransferAccession" value="false"/>
          </map>
       </property>

rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml

@@ -242,15 +242,4 @@
          </list>
       </property>
    </bean>
-
-   <bean id="rmDownloadZipCapability"
-      parent="declarativeCapability">
-      <property name="name" value="DownloadZip"/>
-      <property name="private" value="true"/>
-      <property name="conditions">
-         <map>
-            <entry key="capabilityCondition.readOnChildren" value="true"/>
-         </map>
-      </property>
-   </bean>
 </beans>

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml

@@ -660,7 +660,6 @@
    <bean id="jsonConversionComponent.downloadZip"
          parent="jsonConversionComponent.baseAction">
       <property name="name" value="downloadZip"/>
-      <property name="capability" value="DownloadZip"/>
    </bean>
 
    <bean id="jsonConversionComponent.transferComplete"

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/ChildPermissionCapabilityCondition.java

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2005-2015 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition;
-
-import java.util.List;
-
-import org.alfresco.module.org_alfresco_module_rm.capability.declarative.AbstractCapabilityCondition;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.security.AccessStatus;
-
-/**
- * Base class for FillingOnChildrenCapabilityCondition and ReadOnChildrenCapabilityCondition
- *
- * @author Tuna Aksoy
- * @since 2.3
- */
-public abstract class ChildPermissionCapabilityCondition extends AbstractCapabilityCondition
-{
-    protected boolean evaluateImpl(NodeRef nodeRef, String permission)
-    {
-        boolean result = true;
-
-        List<ChildAssociationRef> childAssocs = nodeService.getChildAssocs(nodeRef);
-        for (ChildAssociationRef childAssociationRef : childAssocs)
-        {
-            NodeRef childRef = childAssociationRef.getChildRef();
-            if (permissionService.hasPermission(childRef, permission) == AccessStatus.DENIED)
-            {
-                result = false;
-                break;
-            }
-        }
-
-        return result;
-    }
-}

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/FillingOnChildrenCapabilityCondition.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2014 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition;
-
-import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
-import org.alfresco.service.cmr.repository.NodeRef;
-
-/**
- * Filling on children capability condition.
- *
- * @author Tuna Aksoy
- * @since 2.3
- */
-public class FillingOnChildrenCapabilityCondition extends ChildPermissionCapabilityCondition
-{
-    /**
-     * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
-     */
-    @Override
-    public boolean evaluateImpl(NodeRef nodeRef)
-    {
-        return evaluateImpl(nodeRef, RMPermissionModel.FILING);
-    }
-}

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/ReadOnChildrenCapabilityCondition.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2005-2014 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition;
-
-import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
-import org.alfresco.service.cmr.repository.NodeRef;
-
-/**
- * Read on children capability condition.
- *
- * @author Tuna Aksoy
- * @since 2.3
- */
-public class ReadOnChildrenCapabilityCondition extends ChildPermissionCapabilityCondition
-{
-    /**
-     * @see org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition#evaluate(org.alfresco.service.cmr.repository.NodeRef)
-     */
-    @Override
-    public boolean evaluateImpl(NodeRef nodeRef)
-    {
-        return evaluateImpl(nodeRef, RMPermissionModel.READ_RECORDS);
-    }
-}