mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merge remote-tracking branch 'origin/release/V2.2' into feature-2.3/merge_from_v2.2.0.1
This commit is contained in:
David Webster
@@ -58,4 +58,4 @@
|
||||
|
||||
|
||||
|
||||
</beans>
|
||||
</beans>
|
||||
|
||||
@@ -79,4 +79,4 @@
|
||||
|
||||
|
||||
|
||||
</beans>
|
||||
</beans>
|
||||
|
||||
@@ -282,4 +282,4 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
</beans>
|
||||
|
||||
@@ -56,4 +56,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.repo.web.scripts.roles.DynamicAuthoritiesGet=info
|
||||
log4j.logger.org.alfresco.repo.web.scripts.roles.DynamicAuthoritiesGet=info
|
||||
|
||||
@@ -13,4 +13,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.
|
||||
|
||||
@@ -102,4 +102,4 @@ capability.MapEmailMetadata.title=Map Email Metadata
|
||||
|
||||
# Rules
|
||||
capability.group.rules.title=Rules
|
||||
capability.ManageRules.title=Manage Rules
|
||||
capability.ManageRules.title=Manage Rules
|
||||
|
||||
@@ -1229,4 +1229,4 @@
|
||||
|
||||
</aspects>
|
||||
|
||||
</model>
|
||||
</model>
|
||||
|
||||
@@ -8,4 +8,4 @@ module.title=Records Management
|
||||
module.description=Alfresco Record Management Extension
|
||||
module.version=2.3
|
||||
|
||||
module.repo.version.min=4.2.2
|
||||
module.repo.version.min=4.2.2
|
||||
|
||||
@@ -103,4 +103,4 @@
|
||||
<property name="authorityService" ref="authorityService"/>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
</beans>
|
||||
|
||||
@@ -1150,4 +1150,4 @@
|
||||
<property name="auditable" value="false"/>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
</beans>
|
||||
|
||||
@@ -148,4 +148,4 @@
|
||||
<property name="publishExecutorRegistry" ref="publishExecutorRegistry"/>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
</beans>
|
||||
|
||||
@@ -173,4 +173,4 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
</beans>
|
||||
|
||||
@@ -923,4 +923,4 @@
|
||||
</property>
|
||||
<property name="capability" value="MoveDmRecords"/>
|
||||
</bean>
|
||||
</beans>
|
||||
</beans>
|
||||
|
||||
@@ -663,4 +663,4 @@
|
||||
parent="rmBaseWebscript">
|
||||
<property name="relationshipService" ref="RelationshipService" />
|
||||
</bean>
|
||||
</beans>
|
||||
</beans>
|
||||
|
||||
@@ -222,4 +222,4 @@
|
||||
"EndRetention"
|
||||
]
|
||||
}
|
||||
]
|
||||
]
|
||||
|
||||
@@ -225,4 +225,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
|
||||
|
||||
@@ -44,4 +44,4 @@
|
||||
<property name="name" value="Declare"/>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
</beans>
|
||||
|
||||
@@ -54,4 +54,4 @@ function main()
|
||||
}
|
||||
}
|
||||
|
||||
main();
|
||||
main();
|
||||
|
||||
@@ -261,4 +261,4 @@
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
||||
|
||||
@@ -1747,4 +1747,4 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean
|
||||
{
|
||||
auditEvent(nodeRef, action.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -379,4 +379,4 @@ public class FreezeServiceImpl extends ServiceBaseImpl
|
||||
// create hold
|
||||
return getHoldService().createHold(filePlan, holdName, reason, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -153,4 +153,4 @@ public class AuditLogGet extends BaseAuditRetrievalWebScript
|
||||
return AccessStatus.ALLOWED.equals(
|
||||
capabilityService.getCapabilityAccessState(targetNode, ACCESS_AUDIT_CAPABILITY));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -212,4 +212,4 @@ public abstract class BaseTransferWebScript extends StreamACP
|
||||
|
||||
return itemsToTransfer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -342,4 +342,4 @@ public class UserRightsReportGet extends DeclarativeWebScript
|
||||
this.users.add(userName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -430,4 +430,4 @@ public class RMSearchGet extends DeclarativeWebScript
|
||||
return properties;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -124,8 +124,9 @@ public class RMPermissionServiceImpl extends PermissionServiceImpl
|
||||
{
|
||||
return super.hasPermission(nodeRef, RMPermissionModel.READ_RECORDS);
|
||||
}
|
||||
// Added ADD_CHILDREN check in for MNT-16852.
|
||||
else if (AccessStatus.DENIED.equals(acs) &&
|
||||
PermissionService.WRITE.equals(perm) &&
|
||||
(PermissionService.WRITE.equals(perm) || PermissionService.ADD_CHILDREN.equals(perm)) &&
|
||||
nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT))
|
||||
{
|
||||
return super.hasPermission(nodeRef, RMPermissionModel.FILE_RECORDS);
|
||||
|
||||
@@ -263,4 +263,4 @@
|
||||
<property name="repository" ref="repositoryHelper" />
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
</beans>
|
||||
|
||||
@@ -66,4 +66,4 @@
|
||||
|
||||
</aspects>
|
||||
|
||||
</model>
|
||||
</model>
|
||||
|
||||
Reference in New Issue
Block a user