mirror of https://github.com/zulip/zulip.git
settings: Remove realm-level default of enable_login_emails setting.
This commit does not remove the 'enable_login_emails' field from RealmUserDefault table but it is just not used and cannot be changed from UI or API similar to 'enable_marketing_emails' setting.
This commit is contained in:
parent
8b638648dc
commit
d1732fb9da
|
@ -62,12 +62,10 @@ function get_realm_level_notification_settings(options) {
|
||||||
realm_user_settings_defaults,
|
realm_user_settings_defaults,
|
||||||
);
|
);
|
||||||
|
|
||||||
// We remove enable_marketing_emails setting from all_notification_settings, since there is no
|
// We remove enable_marketing_emails and enable_login_emails
|
||||||
// realm-level default of this setting.
|
// setting from all_notification_settings, since there are no
|
||||||
all_notifications_settings.settings.other_email_settings = [
|
// realm-level defaults for these setting.
|
||||||
"enable_digest_emails",
|
all_notifications_settings.settings.other_email_settings = ["enable_digest_emails"];
|
||||||
"enable_login_emails",
|
|
||||||
];
|
|
||||||
|
|
||||||
options.general_settings = all_notifications_settings.general_settings;
|
options.general_settings = all_notifications_settings.general_settings;
|
||||||
options.notification_settings = all_notifications_settings.settings;
|
options.notification_settings = all_notifications_settings.settings;
|
||||||
|
|
|
@ -406,9 +406,6 @@ export const realm_user_settings_defaults_labels = {
|
||||||
defaultMessage: "Send mobile notifications even if user is online (useful for testing)",
|
defaultMessage: "Send mobile notifications even if user is online (useful for testing)",
|
||||||
}),
|
}),
|
||||||
enable_digest_emails: $t({defaultMessage: "Send digest emails when user is away"}),
|
enable_digest_emails: $t({defaultMessage: "Send digest emails when user is away"}),
|
||||||
enable_login_emails: $t({
|
|
||||||
defaultMessage: "Send email notifications for new logins to the account",
|
|
||||||
}),
|
|
||||||
|
|
||||||
realm_presence_enabled: $t({defaultMessage: "Display availability to other users when online"}),
|
realm_presence_enabled: $t({defaultMessage: "Display availability to other users when online"}),
|
||||||
realm_enter_sends: $t({defaultMessage: "Enter sends when composing a message"}),
|
realm_enter_sends: $t({defaultMessage: "Enter sends when composing a message"}),
|
||||||
|
|
|
@ -29,7 +29,9 @@ def copy_default_settings(
|
||||||
#
|
#
|
||||||
# Note that this function will do at least one save() on target_profile.
|
# Note that this function will do at least one save() on target_profile.
|
||||||
for settings_name in UserBaseSettings.property_types:
|
for settings_name in UserBaseSettings.property_types:
|
||||||
if settings_name == "default_language" and isinstance(settings_source, RealmUserDefault):
|
if settings_name in ["default_language", "enable_login_emails"] and isinstance(
|
||||||
|
settings_source, RealmUserDefault
|
||||||
|
):
|
||||||
continue
|
continue
|
||||||
value = getattr(settings_source, settings_name)
|
value = getattr(settings_source, settings_name)
|
||||||
setattr(target_profile, settings_name, value)
|
setattr(target_profile, settings_name, value)
|
||||||
|
|
|
@ -7767,13 +7767,6 @@ paths:
|
||||||
schema:
|
schema:
|
||||||
type: boolean
|
type: boolean
|
||||||
example: true
|
example: true
|
||||||
- name: enable_login_emails
|
|
||||||
in: query
|
|
||||||
description: |
|
|
||||||
Enable email notifications for new logins to account.
|
|
||||||
schema:
|
|
||||||
type: boolean
|
|
||||||
example: true
|
|
||||||
- name: message_content_in_email_notifications
|
- name: message_content_in_email_notifications
|
||||||
in: query
|
in: query
|
||||||
description: |
|
description: |
|
||||||
|
|
|
@ -913,7 +913,7 @@ class RealmAPITest(ZulipTestCase):
|
||||||
# duplicate code. default_language is currently present in Realm table also and thus
|
# duplicate code. default_language is currently present in Realm table also and thus
|
||||||
# is updated using '/realm' endpoint, but this will be removed in future and the
|
# is updated using '/realm' endpoint, but this will be removed in future and the
|
||||||
# settings in RealmUserDefault table will be used.
|
# settings in RealmUserDefault table will be used.
|
||||||
if prop in ["default_language", "enable_marketing_emails"]:
|
if prop in ["default_language", "enable_login_emails", "enable_marketing_emails"]:
|
||||||
continue
|
continue
|
||||||
self.do_test_realm_default_setting_update_api(prop)
|
self.do_test_realm_default_setting_update_api(prop)
|
||||||
|
|
||||||
|
|
|
@ -326,7 +326,8 @@ def update_realm_user_settings_defaults(
|
||||||
),
|
),
|
||||||
enable_online_push_notifications: Optional[bool] = REQ(json_validator=check_bool, default=None),
|
enable_online_push_notifications: Optional[bool] = REQ(json_validator=check_bool, default=None),
|
||||||
enable_digest_emails: Optional[bool] = REQ(json_validator=check_bool, default=None),
|
enable_digest_emails: Optional[bool] = REQ(json_validator=check_bool, default=None),
|
||||||
enable_login_emails: Optional[bool] = REQ(json_validator=check_bool, default=None),
|
# enable_login_emails is not included here, because we don't want
|
||||||
|
# security-related settings to be controlled by organization administrators.
|
||||||
# enable_marketing_emails is not included here, since we don't at
|
# enable_marketing_emails is not included here, since we don't at
|
||||||
# present allow organizations to customize this. (The user's selection
|
# present allow organizations to customize this. (The user's selection
|
||||||
# in the signup form takes precedence over RealmUserDefault).
|
# in the signup form takes precedence over RealmUserDefault).
|
||||||
|
|
Loading…
Reference in New Issue