diff --git a/pom.xml b/pom.xml
index 32c09f4fdd..e0c81dd37b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -307,4 +307,4 @@
-
\ No newline at end of file
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-security-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-security-context.xml
index 3839eb268d..ca36cc1caa 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-security-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-security-context.xml
@@ -58,4 +58,4 @@
-
\ No newline at end of file
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-capabilities-classification-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-capabilities-classification-context.xml
index 38866ec77a..03d699f295 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-capabilities-classification-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-capabilities-classification-context.xml
@@ -79,4 +79,4 @@
-
\ No newline at end of file
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
index bda242547d..d14373d965 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
@@ -280,4 +280,4 @@
-
\ No newline at end of file
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/log4j.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/log4j.properties
index 701dae81e6..3596573595 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/log4j.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/log4j.properties
@@ -55,4 +55,4 @@ log4j.logger.org.alfresco.module.org_alfresco_module_rm.patch=info
#
# Job debug
#
-#log4j.logger.org.alfresco.module.org_alfresco_module_rm.job=debug
\ No newline at end of file
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.job=debug
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_es.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_es.properties
index da14c0be69..ce25ad42ba 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_es.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_es.properties
@@ -18,4 +18,4 @@ rm.admin.custom-model-not-found=No se puede encontrar el modelo personalizado ''
rm.admin.custom-model-no-content=El modelo personalizado no tiene contenido (nodeRef={0})
rm.admin.error-write-custom-model=Error al escribir contenido de modelo personalizado. (nodeRef={0})
rm.admin.error-client-id=Error al generar el identificador del cliente porque ya est\u00e1 en uso. (clientid={0})
-rm.admin.error-split-id=No se puede separar el identificador ''{0}'', porque el separador ''{1}'' no est\u00e1 presente.
\ No newline at end of file
+rm.admin.error-split-id=No se puede separar el identificador ''{0}'', porque el separador ''{1}'' no est\u00e1 presente.
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
index d249acb55b..1dbc7b0bf4 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
@@ -101,4 +101,4 @@ capability.MapEmailMetadata.title=Map Email Metadata
# Rules
capability.group.rules.title=Rules
-capability.ManageRules.title=Manage Rules
\ No newline at end of file
+capability.ManageRules.title=Manage Rules
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
index 25d1166376..6ade285156 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
@@ -1229,4 +1229,4 @@
-
\ No newline at end of file
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
index 2c960ee97a..e7bd803ab5 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
@@ -8,4 +8,4 @@ module.title=Records Management
module.description=Alfresco Record Management Extension
module.version=2.2.2
-module.repo.version.min=4.2
\ No newline at end of file
+module.repo.version.min=4.2
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v22-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v22-context.xml
index 039ab39125..27666c3c23 100755
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v22-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v22-context.xml
@@ -103,4 +103,4 @@
-
\ No newline at end of file
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
index 28f8d470ad..a01c96c184 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
@@ -1124,4 +1124,4 @@
-
\ No newline at end of file
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml
index c75861026c..5eb64df974 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml
@@ -148,4 +148,4 @@
-
\ No newline at end of file
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
index 8a6e0809dd..d1620c22a2 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
@@ -171,4 +171,4 @@
-
\ No newline at end of file
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index de9dd93634..1ffeddc927 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -878,4 +878,4 @@
-
\ No newline at end of file
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
index bcab10444b..f7198a3edf 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
@@ -615,4 +615,4 @@
-
\ No newline at end of file
+
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
index 5427da9b42..b338a871bb 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
@@ -219,4 +219,4 @@
"EditHold"
]
}
-]
\ No newline at end of file
+]
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties
index 686dc6c152..c3d7219ce7 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties
@@ -224,4 +224,4 @@ rm.methodsecurity.org.alfresco.repo.forms.FormService.*=RM_DENY
## Ownable Service
rm.methodsecurity.org.alfresco.service.cmr.security.OwnableService.getOwner=RM.Read.0
-rm.methodsecurity.org.alfresco.service.cmr.security.OwnableService.*=RM_DENY
\ No newline at end of file
+rm.methodsecurity.org.alfresco.service.cmr.security.OwnableService.*=RM_DENY
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.js b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.js
index 5415eb9247..23adcc43f3 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.js
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.js
@@ -54,4 +54,4 @@ function main()
}
}
-main();
\ No newline at end of file
+main();
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 04fd9843cd..0e9049e32c 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -273,4 +273,4 @@
1.4.01
-
\ No newline at end of file
+
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
index ad66de4cc1..9268a91270 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
@@ -1738,4 +1738,4 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
{
auditEvent(nodeRef, action.getName());
}
-}
\ No newline at end of file
+}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java
index ad08962a23..2f92ce11f2 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java
@@ -379,4 +379,4 @@ public class FreezeServiceImpl extends ServiceBaseImpl
// create hold
return getHoldService().createHold(filePlan, holdName, reason, null);
}
-}
\ No newline at end of file
+}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java
index 8e9c90b201..0103831ef0 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java
@@ -153,4 +153,4 @@ public class AuditLogGet extends BaseAuditRetrievalWebScript
return AccessStatus.ALLOWED.equals(
capabilityService.getCapabilityAccessState(targetNode, ACCESS_AUDIT_CAPABILITY));
}
-}
\ No newline at end of file
+}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
index 8a7d26f144..b73305ba64 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
@@ -212,4 +212,4 @@ public abstract class BaseTransferWebScript extends StreamACP
return itemsToTransfer;
}
-}
\ No newline at end of file
+}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java
index 955fe2f097..b4eecee68b 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java
@@ -342,4 +342,4 @@ public class UserRightsReportGet extends DeclarativeWebScript
this.users.add(userName);
}
}
-}
\ No newline at end of file
+}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java
index 2c71aeb43e..c17720a165 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java
@@ -442,4 +442,4 @@ public class RMSearchGet extends DeclarativeWebScript
return properties;
}
}
-}
\ No newline at end of file
+}
diff --git a/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java b/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java
index 8e2f552777..e9e21d2183 100644
--- a/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java
@@ -124,9 +124,10 @@ public class RMPermissionServiceImpl extends PermissionServiceImpl
{
return super.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS);
}
- else if (AccessStatus.DENIED.equals(acs) == true &&
- PermissionService.WRITE.equals(perm) == true &&
- nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT) == true)
+ // Added ADD_CHILDREN check in for MNT-16852.
+ else if (AccessStatus.DENIED.equals(acs) &&
+ (PermissionService.WRITE.equals(perm) || PermissionService.ADD_CHILDREN.equals(perm)) &&
+ nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
{
return super.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS);
}
diff --git a/rm-server/test/resources/test-context.xml b/rm-server/test/resources/test-context.xml
index 513dbd0dc2..2924c062dc 100644
--- a/rm-server/test/resources/test-context.xml
+++ b/rm-server/test/resources/test-context.xml
@@ -261,4 +261,4 @@
-
\ No newline at end of file
+
diff --git a/rm-server/test/resources/test-model.xml b/rm-server/test/resources/test-model.xml
index 0caa80c6fe..9078f64208 100644
--- a/rm-server/test/resources/test-model.xml
+++ b/rm-server/test/resources/test-model.xml
@@ -61,4 +61,4 @@
-
\ No newline at end of file
+