Skip to content

Do not block registered users with InviteUserAgain#8268

Merged
leio10 merged 1 commit intodecidim:developfrom
CodiTramuntana:fix/inviting_registered_users
Sep 30, 2021
Merged

Do not block registered users with InviteUserAgain#8268
leio10 merged 1 commit intodecidim:developfrom
CodiTramuntana:fix/inviting_registered_users

Conversation

@tramuntanal
Copy link
Copy Markdown
Contributor

@tramuntanal tramuntanal commented Aug 26, 2021 •
edited
Loading

🎩 What? Why?

Please describe your pull request.
This PR is a continuation of bugfix #7392. It has now been found that the problem described in #6966 extends to

  • inviting private users
  • inviting conference admins
  • inviting monitoring committee members
  • inviting polling officers

To solve the problems user&.invitation_pending? has been extracted and used everywhere to be sure when the user has invitations pending.

📌 Related Issues

Link your PR to an issue

Testing

Describe the best way to test or validate your PR.
Invite an already registered user and check that it can still login.

📋 Checklist

🚨 Please review the guidelines for contributing to this repository.

  • ❓ CONSIDER adding a unit test if your PR resolves an issue.
  • ✔️ DO check open PR's to avoid duplicates.
  • ✔️ DO keep pull requests small so they can be easily reviewed.
  • ✔️ DO build locally before pushing.
  • ✔️ DO make sure tests pass.
  • ✔️ DO make sure any new changes are documented in docs/.
  • ✔️ DO add and modify seeds if necessary.
  • ✔️ DO add CHANGELOG upgrade notes if required.
  • ✔️ DO add to GraphQL API if there are new public fields.
  • ✔️ DO add link to MetaDecidim if it's a new feature.
  • ❌AVOID breaking the continuous integration build.
  • ❌AVOID making significant changes to the overall architecture.

📷 Screenshots

Please add screenshots of the changes you're proposing
Description

♥️ Thank you!

@tramuntanal
Copy link
Copy Markdown
Contributor Author

tramuntanal commented Aug 27, 2021

@leio10 the generators tests are failing because of: ActionView::Template::Error: Webpacker can't find decidim_email.css in /home/runner/work/decidim/decidim/decidim-generators/spec/generator_test_app/public/decidim-packs/manifest.json. Do you know how to solve that problem? It's strange as that problem is not arising in develop and I think it was already solved by @ahukkanen

@leio10
Copy link
Copy Markdown
Contributor

leio10 commented Sep 10, 2021

@tramuntanal I think you can merge the last changes from develop to fix these tests.

@tramuntanal tramuntanal force-pushed the fix/inviting_registered_users branch from b918c19 to e35d9c2 Compare September 13, 2021 08:54
@tramuntanal
Copy link
Copy Markdown
Contributor Author

tramuntanal commented Sep 13, 2021

@leio10 I've rebased develop, but now I see develop is broken, with some suites failing

@leio10
Copy link
Copy Markdown
Contributor

leio10 commented Sep 13, 2021

@tramuntanal yes, we are having weird issues after every weekend 😞.
I've detected the issue with the CSS validation service and opened #8322 to fix it. Hopefuly, it will be working well again in a while.

@tramuntanal tramuntanal force-pushed the fix/inviting_registered_users branch from e35d9c2 to 83ee299 Compare September 13, 2021 11:12
@tramuntanal
Copy link
Copy Markdown
Contributor Author

tramuntanal commented Sep 13, 2021

I've rebased against a green develop and now all checks have passed @leio10 👏 grood job there!

@leio10 leio10 added type: fix PRs that implement a fix for a bug module: admin labels Sep 21, 2021
leio10
leio10 approved these changes Sep 30, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@leio10 leio10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@leio10 leio10 merged commit 8727740 into decidim:develop Sep 30, 2021
@leio10
Copy link
Copy Markdown
Contributor

leio10 commented Sep 30, 2021

Good job @tramuntanal! Please, can you backport this to 0.25? Thanks! ❤️

@tramuntanal tramuntanal deleted the fix/inviting_registered_users branch September 30, 2021 08:10
tramuntanal added a commit to CodiTramuntana/decidim that referenced this pull request Sep 30, 2021
@tramuntanal
Do not block registered users with InviteUserAgain (decidim#8268)
f0040c3
@tramuntanal tramuntanal mentioned this pull request Sep 30, 2021
Merged
@andreslucena andreslucena mentioned this pull request Nov 2, 2021
Closed
@alecslupu alecslupu added this to the 0.26.0 milestone Jul 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@leio10 leio10 leio10 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

in-review module: admin type: fix PRs that implement a fix for a bug

Projects

None yet

Milestone

0.26.0

Development

Successfully merging this pull request may close these issues.

Error when inviting an already registered participant

4 participants

@tramuntanal @leio10 @alecslupu @andreslucena