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

org settings: Handle NEW_USER_BOT not being set.

Browse Source 
If NEW_USER_BOT is not configured in organization, then disable setting
for selecting stream for new user notification.
This commit is contained in:
YJDave
2017-12-20 22:28:49 +05:30
committed by showell
parent 2ca0fb4128
commit 15dd94035c
8 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/js/admin.js
View File

@@ -50,6 +50,7 @@ function _setup_page() {
realm_message_retention_days: page_params.realm_message_retention_days,
realm_allow_edit_history: page_params.realm_allow_edit_history,
language_list: page_params.language_list,
new_user_bot_configured: page_params.new_user_bot_configured,
realm_default_language: page_params.realm_default_language,
realm_waiting_period_threshold: page_params.realm_waiting_period_threshold,
realm_notifications_stream_id: page_params.realm_notifications_stream_id,

2
static/js/settings_org.js
View File

@@ -198,7 +198,7 @@ exports.render_signup_notifications_stream_ui = function (stream_id) {
var name = stream_data.maybe_get_stream_name(stream_id);
if (!name) {
if (!name || !page_params.new_user_bot_configured) {
elem.text(i18n.t("Disabled"));
elem.addClass("text-warning");
return;