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

Check for conflicts.user property before rendering list item #6396

Merged
merged 2 commits into from
Jun 17, 2021
Merged

Check for conflicts.user property before rendering list item #6396

merged 2 commits into from
Jun 17, 2021

Conversation

pierlon
Copy link
Contributor

@pierlon pierlon commented Jun 17, 2021

Summary

Amends #6374.

If there isn't a user with the same slug as the AMP slug, the settings screen crashes.

Checklist

  • My code is tested and passes existing tests.
  • My code follows the Engineering Guidelines (updates are often made to the guidelines, check it out periodically).

@pierlon pierlon added the Bug Something isn't working label Jun 17, 2021
@pierlon pierlon added this to the v2.1.3 milestone Jun 17, 2021
@pierlon pierlon requested a review from westonruter June 17, 2021 20:36
@pierlon pierlon self-assigned this Jun 17, 2021
westonruter
westonruter approved these changes Jun 17, 2021
View reviewed changes
Copy link
Member

@westonruter westonruter left a comment

Choose a reason for hiding this comment

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

Ooops. Thanks!

@pierlon
Copy link
Contributor Author

pierlon commented Jun 17, 2021

Wait one more thing, the CI job to build the zips isn't running.

@github-actions
Copy link
Contributor

Plugin builds for 382b803 are ready 🛎️!

@pierlon
Copy link
Contributor Author

pierlon commented Jun 17, 2021

There we go!

image

@westonruter westonruter mentioned this pull request Jun 17, 2021
Merged
2 tasks
@westonruter westonruter merged commit 2debdb9 into develop Jun 17, 2021
@westonruter westonruter deleted the fix/user-endpoint-conflict branch June 17, 2021 22:02
westonruter pushed a commit that referenced this pull request Jun 17, 2021
@pierlon @westonruter
Check for conflicts.user property before rendering list item (#6396)
f0f8613
@westonruter westonruter self-assigned this Jun 30, 2021
@westonruter
Copy link
Member

QA Passed

Deleting the amp user and leaving other entity conflicts results in no error but the expected entities being listed:

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@westonruter westonruter westonruter approved these changes

Assignees

@westonruter westonruter

Labels
Bug Something isn't working
Projects
None yet
Milestone
v2.1.3
Development

Successfully merging this pull request may close these issues.
2 participants
@pierlon @westonruter