Add add-on data attr if subdomain is set #1036
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
maxxcrawford
commented
Aug 25, 2021
privaterelay/templates/profile.html
Outdated
| {% if settings.PREMIUM_ENABLED %} | ||
| {% with request.user.profile_set.first as user_profile %} | ||
| {% if user_profile.subdomain %} | ||
| data-premium-subdomain-set="true" |
There was a problem hiding this comment.
Rather than just setting true, can I get an output from the variable? Similar to var foo = (x > y) in JS?
There was a problem hiding this comment.
Yup, the user_profile.subdomain value should be a string of the user's subdomain. So it could be:
Suggested change
| data-premium-subdomain-set="true" | |
| data-premium-subdomain-set="{{ user_profile.subdomain }}" |
There was a problem hiding this comment.
Would setting it to a string of the user's subdomain be necessary to check if a user has one?
There was a problem hiding this comment.
@codemist So…if one isn't set is appears as:
data-premium-subdomain-set="None"
So, in your add-on logic, you'll need to catch this. if subdomain === "None", etc.
groovecoder
approved these changes
Aug 25, 2021
privaterelay/templates/profile.html
Outdated
| {% if settings.PREMIUM_ENABLED %} | ||
| {% with request.user.profile_set.first as user_profile %} | ||
| {% if user_profile.subdomain %} | ||
| data-premium-subdomain-set="true" |
There was a problem hiding this comment.
Yup, the user_profile.subdomain value should be a string of the user's subdomain. So it could be:
Suggested change
| data-premium-subdomain-set="true" | |
| data-premium-subdomain-set="{{ user_profile.subdomain }}" |
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.
Expected:
If you're a user who is premium AND logged in AND have registered a subdomain, then the data-attr
data-premium-subdomain-setwill be set to whatever the subdomain is in thefirefox-private-relay-addon-datacustom element.Otherwise, that data-attr will have the value of
Nonein thefirefox-private-relay-addon-dataelement.