paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 10:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Fix incorrect usage of user_settings.

Browse Source 
'corporate_enabled', 'realm_push_notifications_enabled'
and 'realm_digest_emails_enabled' settings are part of
page_params and not user_settings.

This was introduced in 998d710275.
This commit is contained in:
Sahil Batra
2021-08-03 12:56:35 +05:30
committed by Tim Abbott
parent 1965584eec
commit aefab3d898
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
static/js/settings_notifications.js
View File

@@ -5,6 +5,7 @@ import render_stream_specific_notification_row from "../templates/settings/strea
import * as channel from "./channel"; import * as channel from "./channel";
import {$t} from "./i18n"; import {$t} from "./i18n";
import * as notifications from "./notifications"; import * as notifications from "./notifications";
import {page_params} from "./page_params";
import * as settings_config from "./settings_config"; import * as settings_config from "./settings_config";
import * as settings_org from "./settings_org"; import * as settings_org from "./settings_org";
import * as settings_ui from "./settings_ui"; import * as settings_ui from "./settings_ui";
@@ -55,7 +56,7 @@ function update_desktop_icon_count_display() {
} }
export function set_enable_digest_emails_visibility() { export function set_enable_digest_emails_visibility() {
if (user_settings.realm_digest_emails_enabled) { if (page_params.realm_digest_emails_enabled) {
$("#enable_digest_emails_label").parent().show(); $("#enable_digest_emails_label").parent().show();
} else { } else {
$("#enable_digest_emails_label").parent().hide(); $("#enable_digest_emails_label").parent().hide();
@@ -63,7 +64,7 @@ export function set_enable_digest_emails_visibility() {
} }
export function set_enable_marketing_emails_visibility() { export function set_enable_marketing_emails_visibility() {
if (user_settings.corporate_enabled) { if (page_params.corporate_enabled) {
$("#enable_marketing_emails_label").parent().show(); $("#enable_marketing_emails_label").parent().show();
} else { } else {
$("#enable_marketing_emails_label").parent().hide(); $("#enable_marketing_emails_label").parent().hide();
@@ -125,7 +126,7 @@ export function update_page() {
for (const setting of settings_config.all_notification_settings) { for (const setting of settings_config.all_notification_settings) {
if ( if (
setting === "enable_offline_push_notifications" && setting === "enable_offline_push_notifications" &&
!user_settings.realm_push_notifications_enabled !page_params.realm_push_notifications_enabled
) { ) {
// If push notifications are disabled at the realm level, // If push notifications are disabled at the realm level,
// we should just leave the checkbox always off. // we should just leave the checkbox always off.