inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/V2.2.0.x' into feature-2.2/merge-2.2.0.1

Browse Source
This commit is contained in:
David Webster
2016-09-30 15:35:04 +01:00
parent 5fe9416725 adca3362ba
commit 76ca8ea811
28 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -307,4 +307,4 @@
</plugins>
</pluginManagement>
</build>
</project>
</project>

2
rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-security-context.xml
View File

@@ -58,4 +58,4 @@
</beans>
</beans>

2
rm-server/config/alfresco/module/org_alfresco_module_rm/dod5015/dod5015-capabilities-classification-context.xml
View File

@@ -79,4 +79,4 @@
</beans>
</beans>

2
rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml
View File

@@ -280,4 +280,4 @@
</property>
</bean>
</beans>
</beans>

2
rm-server/config/alfresco/module/org_alfresco_module_rm/log4j.properties
View File

@@ -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
#log4j.logger.org.alfresco.module.org_alfresco_module_rm.job=debug

2
rm-server/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_es.properties
View File

@@ -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.
rm.admin.error-split-id=No se puede separar el identificador ''{0}'', porque el separador ''{1}'' no est\u00e1 presente.

2
rm-server/config/alfresco/module/org_alfresco_module_rm/messages/capability-service.properties
View File

@@ -101,4 +101,4 @@ capability.MapEmailMetadata.title=Map Email Metadata
# Rules
capability.group.rules.title=Rules
capability.ManageRules.title=Manage Rules
capability.ManageRules.title=Manage Rules

2
rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
View File

@@ -1229,4 +1229,4 @@
</aspects>
</model>
</model>

2
rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties
View File

@@ -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
module.repo.version.min=4.2

2
rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v22-context.xml
View File

@@ -103,4 +103,4 @@
<property name="authorityService" ref="authorityService"/>
</bean>
</beans>
</beans>

2
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
View File

@@ -1124,4 +1124,4 @@
<property name="auditable" value="false"/>
</bean>
</beans>
</beans>

2
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml
View File

@@ -148,4 +148,4 @@
<property name="publishExecutorRegistry" ref="publishExecutorRegistry"/>
</bean>
</beans>
</beans>

2
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-public-services-security-context.xml
View File

@@ -171,4 +171,4 @@
</property>
</bean>
</beans>
</beans>

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

@@ -878,4 +878,4 @@
</property>
<property name="capability" value ="EditHold"/>
</bean>
</beans>
</beans>

2
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
View File

@@ -615,4 +615,4 @@
<bean id="webscript.org.alfresco.rma.hold.put"
class="org.alfresco.module.org_alfresco_module_rm.script.hold.HoldPut"
parent="rmBaseHold" />
</beans>
</beans>

2
rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json
View File

@@ -219,4 +219,4 @@
"EditHold"
]
}
]
]

2
rm-server/config/alfresco/module/org_alfresco_module_rm/security/rm-method-security.properties
View File

@@ -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
rm.methodsecurity.org.alfresco.service.cmr.security.OwnableService.*=RM_DENY

2
rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/rmpermissions.post.json.js
View File

@@ -54,4 +54,4 @@ function main()
}
}
main();
main();

2
rm-server/pom.xml
View File

@@ -273,4 +273,4 @@
<version>1.4.01</version>
</dependency>
</dependencies>
</project>
</project>

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java
View File

@@ -1738,4 +1738,4 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
{
auditEvent(nodeRef, action.getName());
}
}
}

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java
View File

@@ -379,4 +379,4 @@ public class FreezeServiceImpl extends ServiceBaseImpl
// create hold
return getHoldService().createHold(filePlan, holdName, reason, null);
}
}
}

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/AuditLogGet.java
View File

@@ -153,4 +153,4 @@ public class AuditLogGet extends BaseAuditRetrievalWebScript
return AccessStatus.ALLOWED.equals(
capabilityService.getCapabilityAccessState(targetNode, ACCESS_AUDIT_CAPABILITY));
}
}
}

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BaseTransferWebScript.java
View File

@@ -212,4 +212,4 @@ public abstract class BaseTransferWebScript extends StreamACP
return itemsToTransfer;
}
}
}

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/UserRightsReportGet.java
View File

@@ -342,4 +342,4 @@ public class UserRightsReportGet extends DeclarativeWebScript
this.users.add(userName);
}
}
}
}

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java
View File

@@ -442,4 +442,4 @@ public class RMSearchGet extends DeclarativeWebScript
return properties;
}
}
}
}

7
rm-server/source/java/org/alfresco/repo/security/permissions/impl/RMPermissionServiceImpl.java
View File

@@ -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);
}

2
rm-server/test/resources/test-context.xml
View File

@@ -261,4 +261,4 @@
<property name="repository" ref="repositoryHelper" />
</bean>
</beans>
</beans>

2
rm-server/test/resources/test-model.xml
View File

@@ -61,4 +61,4 @@
</aspects>
</model>
</model>