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

Bugfix 12063 - 500 Error when changing tag in a Contact and clicking save&close [4.x] #12105

Merged
merged 1 commit into from Apr 6, 2023
Merged

Bugfix 12063 - 500 Error when changing tag in a Contact and clicking save&close [4.x] #12105

merged 1 commit into from Apr 6, 2023

Conversation

LordRembo
Copy link
Contributor

@LordRembo LordRembo commented Mar 22, 2023 •
edited

Q A
Bug fix? (use the a.b branch) [ yes]
New feature/enhancement? (use the a.x branch) [ ]
Deprecations? [ ]
BC breaks? (use the c.x branch) [ ]
Automated tests included? [ ]
Related user documentation PR URL mautic/mautic-documentation#...
Related developer documentation PR URL mautic/developer-documentation#...
Issue(s) addressed Fixes #12063

Description:

This fix if for 4.x (5.x version is here)

Steps to test this PR:

  1. Open this PR on Gitpod or pull down for testing locally (see docs on testing PRs here)
  2. You need a Contact that has 1 tag
  3. Edit the Contact and change the tag
  4. Hit Save&Close
  5. You should now be able to reopen the Contact (that wasn't possible before, gave a JS error or server error)
  6. If you open the Audit log, you should see the 'old' and 'new' tag listed in the latest entry

@cla-bot cla-bot bot added the cla-signed The PR contributors have signed the contributors agreement label Mar 22, 2023
@LordRembo LordRembo changed the base branch from 5.x to 4.x March 22, 2023 14:46
@LordRembo LordRembo mentioned this pull request Mar 22, 2023
Closed
1 task
@LordRembo LordRembo marked this pull request as ready for review March 22, 2023 14:48
@LordRembo LordRembo changed the title Bugfix 12063 - 500 Error when changing tag in a Contact and clicking save&close Bugfix 12063 - 500 Error when changing tag in a Contact and clicking save&close [4.x] Mar 22, 2023
@LordRembo LordRembo mentioned this pull request Mar 22, 2023
Merged
This was referenced Mar 24, 2023
Closed
Closed
@MadlenF
Copy link

MadlenF commented Mar 31, 2023

Works as described!

@RCheesley RCheesley added T1 Low difficulty to fix (issue) or test (PR) bug Issues or PR's relating to bugs pending-test-confirmation PR's that require one test before they can be merged contacts Anything related to contacts tags Anything relating to tags labels Apr 4, 2023
RCheesley
RCheesley previously approved these changes Apr 4, 2023
View reviewed changes
Copy link
Sponsor Member

@RCheesley RCheesley left a comment

Choose a reason for hiding this comment

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

Works as expected - thanks for the PR! 🚀

@RCheesley
Copy link
Sponsor Member

@LordRembo this will need to be rebased on the 4.4 branch for the next patch release.

@RCheesley RCheesley added needs-rebase PR's that need to be rebased ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged code-review-needed PR's that require a code review before merging and removed pending-test-confirmation PR's that require one test before they can be merged labels Apr 4, 2023
@RCheesley RCheesley added this to the 4.4.8 milestone Apr 4, 2023
@LordRembo
Copy link
Contributor Author

hmmm, just tried to rebase on 4.4 and resolved conflicts locally, but it' still showing conflicts in here.

@mollux
Copy link
Contributor

mollux commented Apr 4, 2023

@LordRembo I can help here if you want (tomorrow or thursday)

@LordRembo
Copy link
Contributor Author

LordRembo commented Apr 4, 2023 •
edited

@mollux yeah, maybe best on Thursday then, so we can get this thing over and done with, seeing as we're both at the office.

@RCheesley RCheesley mentioned this pull request Apr 5, 2023
Closed
@LordRembo LordRembo changed the base branch from 4.x to 4.4 April 6, 2023 07:01
@LordRembo
Copy link
Contributor Author

@RCheesley it should be okay now, rebased on 4.4

@RCheesley RCheesley closed this Apr 6, 2023
@RCheesley RCheesley reopened this Apr 6, 2023
RCheesley
RCheesley approved these changes Apr 6, 2023
View reviewed changes
Copy link
Sponsor Member

@RCheesley RCheesley left a comment

Choose a reason for hiding this comment

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

Tested after rebase, all good! Thanks @LordRembo and sorry for the faffing about with bases!

@RCheesley RCheesley merged commit e1e868f into mautic:4.4 Apr 6, 2023
19 checks passed
@LordRembo
Copy link
Contributor Author

@RCheesley no worries!

@LordRembo LordRembo deleted the bug-12063 branch April 7, 2023 09:08
@escopecz escopecz removed needs-rebase PR's that need to be rebased code-review-needed PR's that require a code review before merging labels Apr 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RCheesley RCheesley RCheesley approved these changes

Assignees
No one assigned
Labels
bug Issues or PR's relating to bugs cla-signed The PR contributors have signed the contributors agreement contacts Anything related to contacts ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged T1 Low difficulty to fix (issue) or test (PR) tags Anything relating to tags
Projects
None yet
Milestone
4.4.8
Development

Successfully merging this pull request may close these issues.

500 Error when changing tag and save/close
5 participants
@LordRembo @MadlenF @RCheesley @mollux @escopecz