Fix for GWE-282-0 #5126
Merged
Fix for GWE-282-0 #5126
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
danlipert
previously approved these changes
Sep 4, 2019
| @@ -275,6 +276,10 @@ def email_settings(request, key): | |||
| preferred_language = request.POST.get('preferred_language') | |||
| validation_passed = True | |||
| try: | |||
| email_in_use = User.objects.filter(email=email) | User.objects.filter(profile__email=email) | |||
| email_used_marketing = EmailSubscriber.objects.filter(email=email).select_related('profile') | |||
| if (email_in_use or email_used_marketing) and (request.user.email != email or request.user.profile.email != email): | |||
octavioamu
previously approved these changes
Sep 4, 2019
thelostone-mc
requested changes
Sep 4, 2019
There was a problem hiding this comment.
^ We've got CI failures 🤔
@androolloyd mind running the pre commit hooks? that will auto fix the sorting error
Codecov Report
@@ Coverage Diff @@
## master #5126 +/- ##
=========================================
- Coverage 30.9% 30.9% -0.01%
=========================================
Files 219 219
Lines 17618 17623 +5
Branches 2427 2428 +1
=========================================
+ Hits 5445 5446 +1
- Misses 11950 11952 +2
- Partials 223 225 +2
Continue to review full report at Codecov.
|
thelostone-mc
approved these changes
Sep 4, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Addressing GWE-282-0
Refers/Fixes
#5125
Testing
Unable to reproduce GWE-282-0 with this change.