-
-
Notifications
You must be signed in to change notification settings - Fork 7.8k
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
user_settings: Automate 'Include realm name in missedmessage email subject'. #24075
user_settings: Automate 'Include realm name in missedmessage email subject'. #24075
Conversation
Hello @zulip/server-settings members, this pull request was labeled with the "area: settings (user)" label, so you may want to check it out! |
94d68e8
to
b8a32e0
Compare
This commit updates the help page 'email-notification.md' to reflect, the change of 'Include organization name in subject line' settings from checkbox to dropdown in zulip#24075.
This commit updates the help page 'email-notification.md' to reflect, the change of 'Include organization name in subject line' settings from checkbox to dropdown in zulip#24075.
d3aa872
to
074f2d9
Compare
@alya Can you please review this PR? |
Thanks! Could you please add a screenshot of the settings changes as well? |
@alya Added -- Thanks. |
Sorry, where's the screenshot? |
@alya |
Thanks! @sahil839 Would you be up for reviewing this one? I think we'll want to migrate users who haven't toggled this setting to "Automatic", as the issue suggests. I don't know if that's included in the PR already. |
Yes, It is included here in this file. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Posted a couple of comments. Looks good overall.
Also, we do not set the old values for this setting in RealmUserDefault
in the migration. Is there any particular reason for that?
Also I think we can have a better name for the migration file than the current name. (Recently such migrations were divided into multiple files - like one for adding new field, second for setting the new field to values of old fields and third for removing the old field, but I think this makes more sense only when we are renaming the field and having a single file should work fine here.)
zerver/migrations/0423_alter_realmuserdefault_realm_name_in_notifications_and_more.py
Outdated
Show resolved
Hide resolved
This commit updates the help page 'email-notification.md' to reflect, the change of 'Include organization name in subject line' settings from checkbox to dropdown in zulip#24075.
074f2d9
to
2c8fc72
Compare
This commit updates the help page 'email-notification.md' to reflect, the change of 'Include organization name in subject line' settings from checkbox to dropdown in zulip#24075.
2c8fc72
to
3ac6524
Compare
I have corrected this. -- Thanks. (I missed that earlier :) )
I have updated it to |
Looks good. (I have not reviewed the docs changes).
Yes. |
@timabbott This PR has been reviewed by @sahil839 and me, and is ready for you to take a look. Please don't merge the documentation commit; I will tweak it once the feature has been integrated. |
This commit updates the help page 'email-notification.md' to reflect, the change of 'Include organization name in subject line' settings from checkbox to dropdown in zulip#24075.
This commit updates the help page 'email-notification.md' to reflect the change in zulip#24075 from a checkbox to a dropdown for the 'Include organisation name in subject line' setting.
6c0f006
to
9c3c804
Compare
@timabbott This is ready to review. Update in the recent push:
Comments which needs your attention (potential followup PR) |
This commit updates the help page 'email-notification.md' to reflect the change in zulip#24075 from a checkbox to a dropdown for the 'Include organisation name in subject line' setting.
9c3c804
to
b334cef
Compare
This commit updates the help page 'email-notification.md' to reflect the change in zulip#24075 from a checkbox to a dropdown for the 'Include organisation name in subject line' setting.
b334cef
to
559d300
Compare
This commit updates the help page 'email-notification.md' to reflect the change in zulip#24075 from a checkbox to a dropdown for the 'Include organisation name in subject line' setting.
559d300
to
86b41a6
Compare
@timabbott This PR is ready to review after the minor changes. Updates in the recent push
Also, earlier Alya said:
So, the first two commit would be good to merge (if it LGTM). |
This commit adds 'zerver/lib/email_notifications.py' to the FILES_WITH_LEGACY_SUBJECT set. Because the file can have 'subject' in the email sense, it should be exempted from the 'avoid subject as a var' lint rule.
Currently, there is a checkbox setting for whether to "Include realm name in subject of message notification emails". This commit replaces the checkbox setting with a dropdown having values: Automatic [default], Always, Never. The Automatic option includes the realm name if, and only if, there are multiple Zulip realms associated with the user's email. Tests are added and(or) modified. Fixes: zulip#19905.
86b41a6
to
5180fe2
Compare
Dropped the documentation commit and marked this to merge once CI passes. Thanks so much for all the work on this @prakhar1144! Here's the original draft of that change:
|
Thanks. Since the PR is merged, following comments need your attention: ps: The PR description contains an image of updated docs (which I earlier proposed). In case that's helpful in any way. |
Thanks! I don't want to dig through the comment thread -- what happened to the documentation commit (prakhar1144@c193fd4) you had before? |
Assuming it hasn't been merged, you can put it up as a new PR, and I'll use that as a starting point. |
This commit updates the help page 'email-notification.md' to reflect the change in zulip#24075 from a checkbox to a dropdown for the 'Include organisation name in subject line' setting.
Document new "Automatic" configuration option. This commit updates the help page 'email-notification.md' to reflect the change in zulip#24075 from a checkbox to a dropdown for the 'Include organisation name in subject line' setting.
Document new "Automatic" configuration option. This commit updates the help page 'email-notification.md' to reflect the change in #24075 from a checkbox to a dropdown for the 'Include organisation name in subject line' setting.
Under Settings > Notifications, currently, there is a checkbox setting for whether to "Include realm name in subject of message notification emails".
This commit replaces the checkbox setting with a dropdown: Automatic [default], Always, Never
The Automatic option includes the realm name if, and only if, there are multiple Zulip realms associated with the user's email.
Tests are added and(or) modified.
Fixes: #19905.
Screenshots and screen captures:
Following four cases are possible:
Always
Never
2 cases in Automatic
User part of a single org
User part of multiple orgs
Settings Changes
Current
Updated
Dropdown
Second Commit
Current Doc
Updated Doc
Self-review checklist
(variable names, code reuse, readability, etc.).
Communicate decisions, questions, and potential concerns.
Individual commits are ready for review (see commit discipline).
Completed manual review and testing of the following: