Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[TS] LPS-134264 #103363

Closed
wants to merge 1 commit into from
Closed

[TS] LPS-134264 #103363

wants to merge 1 commit into from

Conversation

liferay-continuous-integration
Copy link
Collaborator

Forwarded from: liferay-echo#4885 (Took 1 ci:forward attempt in 57 seconds)
Console

@jonathanmccann
@liferay-echo

Original pull request comment:
Prior to https://issues.liferay.com/browse/LPS-128817 groups were filtered using the following logic:

https://github.com/liferay/liferay-portal-ee/blob/fix-pack-dxp-12-7210/modules/apps/site/site-browser-web/src/main/java/com/liferay/site/browser/web/internal/display/context/SiteBrowserDisplayContext.java#L398-L404

After LPS-128817 filtering only took place if:

  1. filterManageableGroups is true
  2. A value for usersGroups is supplied to the group search

This change in behavior allowed all sites to be returned when a user was adding another user to a site (https://issues.liferay.com/browse/LPS-134264).

The changes in this pull attempt to bring back the previous behavior by checking for the "Assign Members" permission.

Please let me know if there are any questions or if there are any flaws in the logic. Thank you.

✔️ ci:test:sf - 1 out of 1 jobs passed in 3 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 5b0dd2a25496279a49af5a16f62f9170e63663ac

Sender Branch:

Branch Name: LPS-134264
Branch GIT ID: 648dba95ab0592364c4e9163dcda4277b7991345

1 out of 1jobs PASSED
1 Successful Jobs:
For more details click here.

✔️ ci:test:stable - 10 out of 10 jobs passed

✔️ ci:test:relevant - 23 out of 24 jobs passed in 3 hours 32 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 5b0dd2a25496279a49af5a16f62f9170e63663ac

Upstream Comparison:

Branch GIT ID: 7cd2901e5c4f9c48b954eb82b675e9534a7434ca
Jenkins Build URL: Acceptance Upstream DXP (master) #2002

ci:test:stable - 10 out of 10 jobs PASSED
10 Successful Jobs:
ci:test:relevant - 22 out of 24 jobs PASSED
22 Successful Jobs:
For more details click here.

This pull contains no unique failures.

Failures in common with acceptance upstream results at 7cd2901:
  1. test-portal-acceptance-pullrequest-batch(master)/unit-jdk8/0
    Job Results:

    2638 Tests Passed.
    1 Test Failed.

    1. AXIS_VARIABLE=0,label_exp=!master #464803
      1. com.liferay.portal.tools.ConfigurationEnvBuilderTest.testBuildContent
        junit.framework.AssertionFailedError: Run "ant generate-config-env" to regenerate modules/configuration-env.txt. expected:<...ay.asset.categories.[admin.web.internal.configuration.FFAssetCategoriesAdminWebConfiguration_setDisplayPageTemplateEnabled
#
LIFERAY_CONFIGURATION_OVERRIDE_COM_PERIOD_LIFERAY_PERIOD_ASSET_PERIOD_CATEGORIES_PERIOD_ADMIN_PERIOD_WEB_PERIOD_INTERNAL_PERIOD_CONFIGURATION_PERIOD__UPPERCASEF__UPPERCASEF__UPPERCASEA_SSET_UPPERCASEC_ATEGORIES_UPPERCASEA_DMIN_UPPERCASEW_EB_UPPERCASEC_ONFIGURATION_UNDERLINE_SET_UPPERCASED_ISPLAY_UPPERCASEP_AGE_UPPERCASET_EMPLATE_UPPERCASEE_NABLED

        

        com.liferay.asset.categories.]configuration.AssetC...> but was:<...ay.asset.categories.[]configuration.AssetC...>
        

        at com.liferay.portal.tools.ConfigurationEnvBuilderTest.testBuildContent(ConfigurationEnvBuilderTest.java:81)
at com.liferay.portal.kernel.test.rule.AbstractTestRule$2.evaluate(AbstractTestRule.java:99)
at com.liferay.portal.kernel.test.rule.AbstractTestRule$1.evaluate(AbstractTestRule.java:59)

@jonathanmccann
LPS-134264 Ensure that the groups are filtered even if a userId is no…
648dba9 
…t passed in.

With this users who can update other users can no longer see all sites when assigning users to sites.
Closed
@liferay-continuous-integration
Copy link
Collaborator Author

To conserve resources, the PR Tester does not automatically run for forwarded pull requests.

@brianchandotcom
Copy link
Owner

Merged. Thank you.
View total diff: 811805b...5b958de

@liferay-continuous-integration liferay-continuous-integration deleted the ci-forward-LPS-134264-pr-4885-sender-jonathanmccann-ts-1623969603597 branch June 25, 2021 10:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ci:test:relevant - success ci:test:sf - success ci:test:stable - success
Projects
None yet
Milestone
No milestone
3 participants
@liferay-continuous-integration @brianchandotcom @jonathanmccann