Merge remote-tracking branch 'remotes/origin/feature/RM-6792_V1RestAPI' into feature/RM-6796_DeclareAndFileTests

This commit is contained in:
cagache
2019-05-21 15:39:19 +03:00
2 changed files with 3 additions and 3 deletions

View File

@@ -148,7 +148,7 @@ public class FilesEntityResource implements InitializingBean
{ {
// Get record folder, if provided // Get record folder, if provided
NodeRef targetParent = null; NodeRef targetParent = null;
String targetParentId = parameters.getParameter(RMNode.PARAM_PARENT_ID); final String targetParentId = parameters.getParameter(RMNode.PARAM_PARENT_ID);
if (targetParentId != null) if (targetParentId != null)
{ {
targetParent = apiUtils.lookupAndValidateNodeType(targetParentId, RecordsManagementModel.TYPE_RECORD_FOLDER); targetParent = apiUtils.lookupAndValidateNodeType(targetParentId, RecordsManagementModel.TYPE_RECORD_FOLDER);

View File

@@ -1873,14 +1873,14 @@ paths:
$ref: '#/definitions/RecordEntry' $ref: '#/definitions/RecordEntry'
'400': '400':
description: | description: |
Invalid parameter: **fileId** is not a valid format Invalid parameter: **fileId** is not a valid format or **parentId** is not a valid format
'401': '401':
description: Authentication failed description: Authentication failed
'403': '403':
description: Current user does not have permission to declare a record description: Current user does not have permission to declare a record
'404': '404':
description: | description: |
**fileId** does not exist **fileId** does not exist or **parentId** does not exist
'422': '422':
description: | description: |
Model integrity exception: the action breaks system's integrity restrictions Model integrity exception: the action breaks system's integrity restrictions