Merge 4.2.0.1 to 2.4.1

This commit is contained in:
Roy Wetherall
2016-08-12 08:51:14 +10:00
2 changed files with 17 additions and 2 deletions

View File

@@ -44,4 +44,19 @@ Updating License Headers:
In order to refesh out of date license source headers run the following command: In order to refesh out of date license source headers run the following command:
mvn clean install -Dlicense.update.dryrun=false
mvn clean install -Dlicense.update.dryrun=false
Configuring Outlook Integration:
-------------------------------
To download and run RM with the Outlook Integration AMPs installed on the repo and Share use the following commands:
mvn clean install -Pstart-repo,outlook-integration
mvn clean install -Pstart-share,outlook-integration
Follow these instructions install licence and Outlook plugin:
- http://docs.alfresco.com/outlook2.1/tasks/Outlook-license.html
- http://docs.alfresco.com/outlook2.1/tasks/Outlook-install_v2.html

View File

@@ -68,7 +68,7 @@ public class RecordsManagementPermissionPostProcessor extends PermissionPostProc
result = permissionService.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS); result = permissionService.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS);
} }
// if write deinied on rm artificat // if write deinied on rm artificat
else if (PermissionService.WRITE.equals(perm)) else if (PermissionService.WRITE.equals(perm) || PermissionService.ADD_CHILDREN.equals(perm))
{ {
// check for file record // check for file record
result = permissionService.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS); result = permissionService.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS);