Arthur Bogaart pushed to branch feature/create-content at cms-community /
hippo-addon-channel-manager
Commits:
2a0ef552 by Arthur Bogaart at 2017-11-20T16:12:05+01:00
CHANNELMGR-1600 Return handle UUID instead of variant UUID
The workflow.add() call returns the variant path instead of the handle
path, so we need to get the parent node to be able to returns the
correct UUID.
- - - - -
2 changed files:
-
content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImpl.java
-
content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImplTest.java
Changes:
=====================================
content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImpl.java
=====================================
---
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImpl.java
+++
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImpl.java
@@ -244,7 +244,8 @@ class DocumentsServiceImpl implements DocumentsService {
final String documentPath = folderWorkflow.add(templateQuery,
documentTypeId, encodedSlug);
log.debug("Created document {}", documentPath);
- final Node handle = session.getNode(documentPath);
+ final Node document = session.getNode(documentPath);
+ final Node handle = document.getParent();
if (!encodedSlug.equals(encodedName)) {
DocumentNameUtils.setDisplayName(handle, encodedName);
=====================================
content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImplTest.java
=====================================
---
a/content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImplTest.java
+++
b/content-service/src/test/java/org/onehippo/cms/channelmanager/content/document/DocumentsServiceImplTest.java
@@ -1469,9 +1469,10 @@ public class DocumentsServiceImplTest {
expect(WorkflowUtils.getWorkflow(eq(folderNode), eq("internal"),
eq(FolderWorkflow.class)))
.andReturn(Optional.of(folderWorkflow));
expect(folderWorkflow.add(eq("new-news-document"),
eq("project:newsdocument"), eq("breaking-news")))
- .andReturn("/content/documents/channel/news/breaking-news");
-
expect(session.getNode(eq("/content/documents/channel/news/breaking-news")))
- .andReturn(documentHandle);
+
.andReturn("/content/documents/channel/news/breaking-news/breaking-news");
+
expect(session.getNode(eq("/content/documents/channel/news/breaking-news/breaking-news")))
+ .andReturn(documentDraft);
+ expect(documentDraft.getParent()).andReturn(documentHandle);
DocumentNameUtils.setDisplayName(eq(documentHandle), eq("Breaking News
(encoded)"));
expectLastCall();
@@ -1534,9 +1535,10 @@ public class DocumentsServiceImplTest {
expect(WorkflowUtils.getWorkflow(eq(folderNode), eq("internal"),
eq(FolderWorkflow.class)))
.andReturn(Optional.of(folderWorkflow));
expect(folderWorkflow.add(eq("new-news-document"),
eq("project:newsdocument"), eq("breaking-news")))
- .andReturn("/content/documents/channel/news/breaking-news");
-
expect(session.getNode(eq("/content/documents/channel/news/breaking-news")))
- .andReturn(documentHandle);
+
.andReturn("/content/documents/channel/news/breaking-news/breaking-news");
+
expect(session.getNode(eq("/content/documents/channel/news/breaking-news/breaking-news")))
+ .andReturn(documentDraft);
+ expect(documentDraft.getParent()).andReturn(documentHandle);
DocumentNameUtils.setDisplayName(eq(documentHandle), eq("Breaking News
(encoded)"));
expectLastCall();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/2a0ef552f305a44e8ffd2185b7662539b019edc0
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/2a0ef552f305a44e8ffd2185b7662539b019edc0
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
