Model & migration for domain-scoped API keys #28608
Merged
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
millerdev
approved these changes
Oct 7, 2020
corehq/apps/users/models.py
Outdated
| @@ -3080,4 +3081,6 @@ def role(self): | |||
| return UserRole.get(self.role_id) | |||
| except ResourceNotFound: | |||
| logging.exception('no role with id %s found in domain %s' % (self.role_id, self.domain)) | |||
| elif self.domain: | |||
| return CouchUser.from_django_user(self.user).get_domain_membership(self.domain).role | |||
There was a problem hiding this comment.
This looks like a behavior change. Curious why it was included in this PR?
There was a problem hiding this comment.
Yeah, I agree, I should drop that. I'm probably going to amend this commit instead of adding a new one, so that when we merge the original branch we get a conflict instead of the risk of dropping these two lines by accident. (I'm not sure I explained that very well. And I think we'd get a conflict either way. But I'd hate Git to apply the "drop those lines" commit to the second merge.)
(I also forgot to rename that migration.)
kaapstorm
force-pushed
the
nh/role-ui-mig
branch
from
7e6039e to
04799ea
Compare
millerdev
approved these changes
Oct 7, 2020
|
thanks for picking this up! |
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.
This PR cherrypicks 2 commits from PR #28493 , to follow up @millerdev's comment here.
It separates out the model change and corresponding migration from the rest of the PR, in order to eliminate the risk of complications if we need to roll back the feature.
RISK ASSESSMENT / QA PLAN
QA has just passed for the original PR.
cc @millerdev