forked from liferay/liferay-portal
-
Notifications
You must be signed in to change notification settings - Fork 28
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
LPS-32718 #13862
Closed
caorongjin
wants to merge
8
commits into
brianchandotcom:master
from
caorongjin:pull-request-125-LPS-32718
Closed
LPS-32718 #13862
caorongjin
wants to merge
8
commits into
brianchandotcom:master
from
caorongjin:pull-request-125-LPS-32718
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
…has permission to view
…inheriting the document type restrictions or not
…ed in that folder. If we inherit we return the document types allowed in the folder we are inheriting from (even it if it's empty). We don't want to always return at least one document type, because if the folder is restricted to only one document type and the user cannot add that document type, he won't be able to add any document in that folder.
…ct amongst the document types supported by that folder, considering that either he has VIEW permission on the doc types or it's the basic document, or it's the current document type of the document.
… we will get duplicates when applying permission to the query
… the permissions. As "Basic Document" is an entity that doesn't have any permission (because it's a 'fake' entity) we need to extract it from the query affected by the permission and do a UNION ALL to make sure that it's always returned.
…FileEntryTypeServiceUtil.getFolderFileEntryTypes except when we are in a external repo that doesn't allow fileEntryTypes that we return Basic Document. The option to upload multiple documents will be displayed if the user has permission to upload a fileEntryType in that folder (upload multiple documents is not supported in external repos)
Some tests have FAILED. ❌ |
Merged. Thank you. |
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.
No description provided.