paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-08 07:52:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

realm-icon: Fix variable name for realm icon source.

Browse Source
This commit is contained in:
K.Kanakhin
2017-03-06 11:06:23 +06:00
committed by Tim Abbott
parent d4a004c420
commit 72424f3a9f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/realm_icon.js
View File

@@ -30,7 +30,7 @@ var realm_icon = (function () {
exports.rerender = function () { exports.rerender = function () {
$("#realm-settings-icon").attr("src", page_params.realm_icon_url); $("#realm-settings-icon").attr("src", page_params.realm_icon_url);
if (page_params.icon_source === 'U') { if (page_params.realm_icon_source === 'U') {
$("#realm_icon_delete_button").show(); $("#realm_icon_delete_button").show();
} else { } else {
$("#realm_icon_delete_button").hide(); $("#realm_icon_delete_button").hide();

2
static/js/server_events.js
View File

@@ -85,7 +85,7 @@ function dispatch_normal_event(event) {
page_params.realm_waiting_period_threshold = event.value; page_params.realm_waiting_period_threshold = event.value;
} else if (event.op === 'update_dict' && event.property === 'icon') { } else if (event.op === 'update_dict' && event.property === 'icon') {
page_params.realm_icon_url = event.data.icon_url; page_params.realm_icon_url = event.data.icon_url;
page_params.icon_source = event.data.icon_source; page_params.realm_icon_source = event.data.icon_source;
realm_icon.rerender(); realm_icon.rerender();
} }

4
zerver/views/home.py
View File

@@ -214,8 +214,8 @@ def home_real(request):
password_auth_enabled = password_auth_enabled(user_profile.realm), password_auth_enabled = password_auth_enabled(user_profile.realm),
domain = user_profile.realm.domain, domain = user_profile.realm.domain,
domains = list_of_domains_for_realm(user_profile.realm), domains = list_of_domains_for_realm(user_profile.realm),
realm_icon_url = realm_icon_url(user_profile.realm), realm_icon_url = register_ret['realm_icon_url'],
realm_icon_source = user_profile.realm.icon_source, realm_icon_source = register_ret['realm_icon_source'],
name_changes_disabled = name_changes_disabled(user_profile.realm), name_changes_disabled = name_changes_disabled(user_profile.realm),
mandatory_topics = user_profile.realm.mandatory_topics, mandatory_topics = user_profile.realm.mandatory_topics,
show_digest_email = user_profile.realm.show_digest_email, show_digest_email = user_profile.realm.show_digest_email,