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

Jump to bottom

Fixed bad model names that prevented unlock overrides SMS and Notifications #3131

Merged
merged 1 commit into from Dec 29, 2016
Merged

Fixed bad model names that prevented unlock overrides SMS and Notifications #3131

merged 1 commit into from Dec 29, 2016

Conversation

alanhartless
Copy link
Contributor

@alanhartless alanhartless commented Dec 22, 2016 •
edited by dbhurley

Q A
Bug fix? y
New feature?
Related user documentation PR URL
Related developer documentation PR URL
Issues addressed (#s or URLs) #3128
BC breaks?
Deprecations?

Description:

This fixes an issue where an administrator could not override locks on sms messages and notifications.

Steps to test this PR:

  1. Use one user to edit a sms message and leave it open
  2. Login as a different administrator in another browser and try to edit the same sms and/or notification
  3. You should get a flash with a link to override
  4. Click the override link
  5. Edit the message and this time it should let you

Steps to reproduce the bug:

  1. Same as above only the unlock link will say success but it remains locked

@alanhartless alanhartless added bug Issues or PR's relating to bugs ready-to-test PR's that are ready to test labels Dec 22, 2016
@alanhartless alanhartless added this to the 2.5 milestone Dec 22, 2016
@escopecz escopecz self-requested a review December 27, 2016 16:25
@escopecz escopecz self-assigned this Dec 27, 2016
escopecz
escopecz approved these changes Dec 28, 2016
View reviewed changes
Copy link
Sponsor Member

@escopecz escopecz left a comment

Choose a reason for hiding this comment

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

Works 👍

@escopecz escopecz removed their assignment Dec 28, 2016
@escopecz escopecz added the pending-test-confirmation PR's that require one test before they can be merged label Dec 28, 2016
@dongilbert dongilbert self-assigned this Dec 28, 2016
@mqueme
Copy link
Contributor

mqueme commented Dec 28, 2016

There is no edit button after I override the link

@mqueme
Copy link
Contributor

mqueme commented Dec 28, 2016

After I refreshed, the buttons did appear. and it worked fine 👍

@mqueme mqueme added ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged and removed pending-test-confirmation PR's that require one test before they can be merged labels Dec 28, 2016
@escopecz escopecz removed the ready-to-test PR's that are ready to test label Dec 29, 2016
@dongilbert dongilbert removed their assignment Dec 29, 2016
@alanhartless alanhartless merged commit 6012c97 into mautic:staging Dec 29, 2016
@alanhartless alanhartless deleted the bug-sms-override-lock branch January 13, 2017 03:59
@escopecz escopecz removed ready-to-commit PR's with 2 successful tests, 1 approval, automated tests and docs and is ready to be merged labels Oct 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@escopecz escopecz escopecz approved these changes

Assignees
No one assigned
Labels
bug Issues or PR's relating to bugs
Projects
None yet
Milestone
2.5
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@alanhartless @mqueme @escopecz @dongilbert