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.

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

[Fixes #9115] Advanced Workflow: permissions assigned to managers/members should be filtered by owner and resource group metadata only #9119

Merged
merged 12 commits into from
Apr 19, 2022

Conversation

afabiani
Copy link
Member

References: #9115

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

For all pull requests:

  • Confirm you have read the contribution guidelines
  • You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in the documentation)
  • Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

  • There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemption is, changes not visible to end-users)
  • The issue connected to the PR must have Labels and Milestone assigned
  • PR for bug fixes and small new features are presented as a single commit
  • Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
  • New unit tests have been added covering the changes, unless there is an explanation on why the tests are not necessary/implemented
  • This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
  • This PR passes the QA checks: flake8 geonode
  • Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates
  • Commits adding new texts do use gettext and have updated .po / .mo files (without location infos)

Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.

@afabiani afabiani added this to the 4.0.0 milestone Apr 15, 2022
@afabiani afabiani self-assigned this Apr 15, 2022
@cla-bot cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Apr 15, 2022
@codecov
Copy link

codecov bot commented Apr 15, 2022

Codecov Report

Merging #9119 (bc486ab) into master (30e4e5c) will decrease coverage by 0.00%.
The diff coverage is 66.66%.

❗ Current head bc486ab differs from pull request most recent head 283e9f3. Consider uploading reports for the commit 283e9f3 to get more accurate results

@@            Coverage Diff             @@
##           master    #9119      +/-   ##
==========================================
- Coverage   60.71%   60.71%   -0.01%     
==========================================
  Files         805      805              
  Lines       49294    49291       -3     
  Branches     7589     7591       +2     
==========================================
- Hits        29931    29928       -3     
+ Misses      17702    17701       -1     
- Partials     1661     1662       +1     

afabiani added 3 commits April 19, 2022 12:09
…s into the "perm_spec"

 - Fixes: The "update_metadata" does not forward information about group and approval status change to the update method
@giohappy giohappy merged commit fc00c9c into master Apr 19, 2022
github-actions bot pushed a commit that referenced this pull request Apr 19, 2022
…bers should be filtered by owner and resource group metadata only (#9119)

* [Fixes #9106] Implement API for compact permissions

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [Fixes #9114] Group managers are assigned Manage permission on adding a group with any permission in share permissions form

* [Fixes #9115] Advanced Workflow: permissions assigned to managers/members should be filtered by owner and resource group metadata only

* - Fixes: The "get_all_level_info" forcibly and wrongly writes manages into the "perm_spec"

 - Fixes: The "update_metadata" does not forward information about group and approval status change to the update method

* - Fixes: promotion/demotion consider the owner's group also
giohappy pushed a commit that referenced this pull request Apr 19, 2022
…bers should be filtered by owner and resource group metadata only (#9119) (#9159)

* [Fixes #9106] Implement API for compact permissions

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [CircleCi] Fix tests

* [Fixes #9114] Group managers are assigned Manage permission on adding a group with any permission in share permissions form

* [Fixes #9115] Advanced Workflow: permissions assigned to managers/members should be filtered by owner and resource group metadata only

* - Fixes: The "get_all_level_info" forcibly and wrongly writes manages into the "perm_spec"

 - Fixes: The "update_metadata" does not forward information about group and approval status change to the update method

* - Fixes: promotion/demotion consider the owner's group also

Co-authored-by: Alessio Fabiani <[email protected]>
@afabiani afabiani deleted the ISSUE_9115 branch April 19, 2022 18:00
@afabiani afabiani added the backport 3.3.x PR should be backported to target version label Apr 19, 2022
@github-actions
Copy link
Contributor

The backport to 3.3.x failed:

The process 'git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-3.3.x 3.3.x
# Navigate to the new working tree
cd .worktrees/backport-3.3.x
# Create a new branch
git switch --create backport-9119-to-3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick fc00c9c615bbd201fb5ea3c026867886d62ef652
# Push it to GitHub
git push --set-upstream origin backport-9119-to-3.3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-3.3.x

Then, create a pull request where the base branch is 3.3.x and the compare/head branch is backport-9119-to-3.3.x.

@afabiani afabiani added backport 3.3.x PR should be backported to target version and removed backport 3.3.x PR should be backported to target version labels Apr 19, 2022
@github-actions
Copy link
Contributor

The backport to 3.3.x failed:

The process 'git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-3.3.x 3.3.x
# Navigate to the new working tree
cd .worktrees/backport-3.3.x
# Create a new branch
git switch --create backport-9119-to-3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick fc00c9c615bbd201fb5ea3c026867886d62ef652
# Push it to GitHub
git push --set-upstream origin backport-9119-to-3.3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-3.3.x

Then, create a pull request where the base branch is 3.3.x and the compare/head branch is backport-9119-to-3.3.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 3.3.x PR should be backported to target version cla-signed CLA Bot: community license agreement signed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants