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 branch 'master' into feature/RM-4921_ExceptionsDoneOnTransactionCommit

Browse Source
This commit is contained in:
Ramona Popa
2017-05-09 14:23:05 +03:00
parent ee75a3ac56 5635d72f4d
commit 1297b61e7e
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordFolderAPI.java
View File

@@ -223,7 +223,7 @@ public class RecordFolderAPI extends RMModelRequest
/** /**
* Create a record from file resource * Create a record from file resource
* *
* @param electronicRecordModel {@link Record} for electronic record to be created * @param recordModel {@link Record} for electronic record to be created
* @param recordContent {@link File} pointing to the content of the electronic record to be created * @param recordContent {@link File} pointing to the content of the electronic record to be created
* @param recordFolderId The identifier of a record folder * @param recordFolderId The identifier of a record folder
* @return newly created {@link Record} * @return newly created {@link Record}

4
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/RecordCategoryTests.java
View File

@@ -488,7 +488,7 @@ public class RecordCategoryTests extends BaseRMRestTest
{ {
// The record category to be created // The record category to be created
RecordCategory recordCategoryModel = RecordCategory.builder() RecordCategory recordCategoryModel = RecordCategory.builder()
.name(RECORD_CATEGORY_NAME) .name(RECORD_CATEGORY_NAME + getRandomAlphanumeric())
.nodeType(RECORD_CATEGORY_TYPE) .nodeType(RECORD_CATEGORY_TYPE)
.build(); .build();
FilePlanAPI filePlansAPI = getRestAPIFactory().getFilePlansAPI(); FilePlanAPI filePlansAPI = getRestAPIFactory().getFilePlansAPI();
@@ -593,7 +593,7 @@ public class RecordCategoryTests extends BaseRMRestTest
{ {
// The record category to be created // The record category to be created
RecordCategory recordCategoryModel = RecordCategory.builder() RecordCategory recordCategoryModel = RecordCategory.builder()
.name(RECORD_CATEGORY_NAME+getRandomAlphanumeric()) .name(RECORD_CATEGORY_NAME + getRandomAlphanumeric())
.nodeType(RECORD_CATEGORY_TYPE) .nodeType(RECORD_CATEGORY_TYPE)
.build(); .build();
FilePlanAPI filePlansAPI = getRestAPIFactory().getFilePlansAPI(); FilePlanAPI filePlansAPI = getRestAPIFactory().getFilePlansAPI();

4
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java
View File

@@ -131,7 +131,7 @@ public class RecordFolderTests extends BaseRMRestTest
/** /**
* <pre> * <pre>
* Given that RM site is created * Given that RM site is created
* When I use the API to create a children inside a record folder with wron types * When I use the API to create a children of wrong type inside a record folder
* Then the operation fails * Then the operation fails
* </pre> * </pre>
*/ */
@@ -141,7 +141,7 @@ public class RecordFolderTests extends BaseRMRestTest
dataProvider = "childrenNotAllowedForFolder" dataProvider = "childrenNotAllowedForFolder"
) )
public void createRecordFolderIntoSpecialContainers(String nodeType) throws Exception public void createInvalidChildrenForFolder(String nodeType) throws Exception
{ {
//create a record folder //create a record folder
RecordCategoryChild folder = createCategoryFolderInFilePlan(); RecordCategoryChild folder = createCategoryFolderInFilePlan();

2
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/unfiledrecordfolders/UnfiledRecordsFolderTests.java
View File

@@ -106,7 +106,7 @@ public class UnfiledRecordsFolderTests extends BaseRMRestTest
{ getRestAPIFactory().getUnfiledContainersAPI().getUnfiledContainer(UNFILED_RECORDS_CONTAINER_ALIAS).getId() }, { getRestAPIFactory().getUnfiledContainersAPI().getUnfiledContainer(UNFILED_RECORDS_CONTAINER_ALIAS).getId() },
{ getRestAPIFactory().getTransferContainerAPI().getTransferContainer(TRANSFERS_ALIAS).getId() }, { getRestAPIFactory().getTransferContainerAPI().getTransferContainer(TRANSFERS_ALIAS).getId() },
// an arbitrary record category // an arbitrary record category
{ createRootCategory(RECORD_CATEGORY_NAME).getId() }, { createRootCategory(RECORD_CATEGORY_NAME + getRandomAlphanumeric()).getId() },
// an arbitrary unfiled records folder // an arbitrary unfiled records folder
{createCategoryFolderInFilePlan().getId()}, {createCategoryFolderInFilePlan().getId()},
{createUnfiledContainerChild(UNFILED_RECORDS_CONTAINER_ALIAS, "Unfiled Record " + getRandomAlphanumeric(), CONTENT_TYPE).getId() } {createUnfiledContainerChild(UNFILED_RECORDS_CONTAINER_ALIAS, "Unfiled Record " + getRandomAlphanumeric(), CONTENT_TYPE).getId() }

2
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -1798,7 +1798,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
) )
public void onContentUpdate(NodeRef nodeRef, boolean newContent) public void onContentUpdate(NodeRef nodeRef, boolean newContent)
{ {
if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_HIDDEN) && !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_LOCKABLE)) if (nodeService.exists(nodeRef) && !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_HIDDEN) && !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_LOCKABLE))
{ {
appendIdentifierToName(nodeService, nodeRef); appendIdentifierToName(nodeService, nodeRef);
} }