Sending the full container path to the UI #17950
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dev-dotcms
reviewed
Feb 4, 2020
| final ContainerLoader containerLoader = new ContainerLoader(); | ||
|
|
||
| final VelocityResourceKey velocityResourceKey = new VelocityResourceKey(fileAssetContainer, PageMode.EDIT_MODE); | ||
| final InputStream inputStream = containerLoader.writeObject(velocityResourceKey); |
There was a problem hiding this comment.
dev-dotcms
reviewed
Feb 4, 2020
| import com.dotcms.datagen.SiteDataGen; | ||
| import com.dotmarketing.beans.Host; | ||
| import com.dotmarketing.business.APILocator; | ||
| import com.dotmarketing.portlets.ContentletBaseTest; | ||
| import com.dotmarketing.portlets.containers.model.Container; | ||
| import com.dotmarketing.portlets.containers.model.FileAssetContainer; | ||
| import com.dotmarketing.portlets.folders.model.Folder; |
There was a problem hiding this comment.
dev-dotcms
reviewed
Feb 4, 2020
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import java.util.Optional; |
There was a problem hiding this comment.
dev-dotcms
reviewed
Feb 4, 2020
| import com.dotmarketing.portlets.containers.model.Container; | ||
| import com.dotmarketing.portlets.containers.model.FileAssetContainer; | ||
| import com.dotmarketing.portlets.folders.model.Folder; | ||
| import com.dotmarketing.util.Constants; |
There was a problem hiding this comment.
dev-dotcms
reviewed
Feb 4, 2020
| import com.dotmarketing.portlets.containers.model.FileAssetContainer; | ||
| import com.dotmarketing.portlets.folders.model.Folder; | ||
| import com.dotmarketing.util.Constants; | ||
| import com.dotmarketing.util.HostUtil; |
There was a problem hiding this comment.
dev-dotcms
reviewed
Feb 4, 2020
| @@ -1,14 +1,49 @@ | |||
| package com.dotmarketing.portlets.containers.business; | |||
|
|
|||
| import com.dotcms.datagen.ContainerAsFileDataGen; | |||
| import com.dotcms.datagen.FolderDataGen; | |||
There was a problem hiding this comment.
dev-dotcms
reviewed
Feb 4, 2020
| import com.dotcms.datagen.SiteDataGen; | ||
| import com.dotmarketing.beans.Host; | ||
| import com.dotmarketing.business.APILocator; | ||
| import com.dotmarketing.portlets.ContentletBaseTest; | ||
| import com.dotmarketing.portlets.containers.model.Container; |
There was a problem hiding this comment.
dev-dotcms
reviewed
Feb 4, 2020
...MS/src/integration-test/java/com/dotcms/rendering/velocity/services/ContainerLoaderTest.java
Show resolved
Hide resolved
dev-dotcms
reviewed
Feb 4, 2020
| import com.dotmarketing.business.APILocator; | ||
| import com.dotmarketing.exception.DotDataException; | ||
| import com.dotmarketing.exception.DotSecurityException; | ||
| import com.dotmarketing.portlets.containers.model.Container; |
There was a problem hiding this comment.
dev-dotcms
reviewed
Feb 4, 2020
| import java.io.InputStream; | ||
| import java.nio.charset.StandardCharsets; | ||
|
|
||
| import static org.junit.Assert.assertEquals; |
There was a problem hiding this comment.
dsilvam
approved these changes
Feb 4, 2020
nollymar
reviewed
Feb 5, 2020
| * Should: return a div with the File Comntainer's id | ||
| */ | ||
| @Test | ||
| public void aaa() throws DotDataException, DotSecurityException, IOException { |
There was a problem hiding this comment.
nollymar
reviewed
Feb 5, 2020
| final ContainerLoader containerLoader = new ContainerLoader(); | ||
|
|
||
| final VelocityResourceKey velocityResourceKey = new VelocityResourceKey(fileAssetContainer, PageMode.EDIT_MODE); | ||
| final InputStream inputStream = containerLoader.writeObject(velocityResourceKey); |
There was a problem hiding this comment.
this InputStream should be closed in a finally statement or in a try with resources
There was a problem hiding this comment.
nollymar
approved these changes
Feb 5, 2020
delete-merged-branch
bot
deleted the
issue-17749-Containers-as-files-outside-default-host
branch
dsilvam
pushed a commit
that referenced
this pull request
Feb 12, 2020
* Sending the full container path to the UI * codacy refactoring * renaming test method and close resource correctly
freddyucv
pushed a commit
that referenced
this pull request
Feb 25, 2020
This reverts commit 655f786.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The Multi tree was saved with the default host container id and not with the container's id in the new site, so now it is send the container full path to the UI, then it is send back by the UI when a Multi tree is saved