From 46defdfcfbc7d3cee446784d195ead693cc80686 Mon Sep 17 00:00:00 2001 From: Sahil Batra Date: Thu, 14 Nov 2024 15:32:05 +0530 Subject: [PATCH] stream-settings: Avoid duplicate IDs for setting elements. We previously had same ID for setting elements in stream creation and stream edit form. This commit adds "new_" prefix before the setting name to avoid duplicate IDs. --- web/src/stream_edit.ts | 2 +- web/templates/stream_settings/stream_creation_form.hbs | 3 ++- web/templates/stream_settings/stream_settings.hbs | 1 + web/templates/stream_settings/stream_types.hbs | 10 +++++----- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/web/src/stream_edit.ts b/web/src/stream_edit.ts index a97a2f68fb..2244c9cb74 100644 --- a/web/src/stream_edit.ts +++ b/web/src/stream_edit.ts @@ -717,7 +717,7 @@ export function initialize(): void { function (this: HTMLSelectElement) { const message_retention_setting_dropdown_value = this.value; settings_components.change_element_block_display_property( - "stream_message_retention_custom_input", + "id_stream_message_retention_custom_input", message_retention_setting_dropdown_value === "custom_period", ); }, diff --git a/web/templates/stream_settings/stream_creation_form.hbs b/web/templates/stream_settings/stream_creation_form.hbs index eb003286ee..69b94838eb 100644 --- a/web/templates/stream_settings/stream_creation_form.hbs +++ b/web/templates/stream_settings/stream_creation_form.hbs @@ -28,7 +28,8 @@ {{> stream_types . stream_post_policy=stream_post_policy_values.everyone.code is_stream_edit=false - can_remove_subscribers_setting_widget_name="new_stream_can_remove_subscribers_group" }} + can_remove_subscribers_setting_widget_name="new_stream_can_remove_subscribers_group" + prefix="id_new_" }} diff --git a/web/templates/stream_settings/stream_settings.hbs b/web/templates/stream_settings/stream_settings.hbs index d6b7b5b24f..552699db2a 100644 --- a/web/templates/stream_settings/stream_settings.hbs +++ b/web/templates/stream_settings/stream_settings.hbs @@ -68,6 +68,7 @@ org_level_message_retention_setting=../org_level_message_retention_setting is_stream_edit=true can_remove_subscribers_setting_widget_name="can_remove_subscribers_group" + prefix="id_" }} {{/with}}
diff --git a/web/templates/stream_settings/stream_types.hbs b/web/templates/stream_settings/stream_types.hbs index 2e8b75c455..222c95e79e 100644 --- a/web/templates/stream_settings/stream_types.hbs +++ b/web/templates/stream_settings/stream_types.hbs @@ -14,7 +14,7 @@ {{> ../help_link_widget link="/help/channel-permissions" }} -
+
{{#each stream_privacy_policy_values}}