Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

stream-settings: Show indicator on notification settings. 

In the Personal settings stream management panel,
when notification settings are changed, Saving/Saved
indicator are shown on personal settings heading instead
of notification settings heading.

Fix this issue by showing indicator on
notification settings heading.

Fixes: zulip#28728.
This commit is contained in:
vighneshbhat9945 2024-02-05 18:51:49 +05:30 committed by Tim Abbott
parent ab927cbb2a
commit f9ba4da012
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dump.rdb Normal file
View File

Binary file not shown.

4
web/src/stream_edit.js
View File

@ -304,13 +304,13 @@ function stream_notification_reset(e) {
stream_settings_api.bulk_set_stream_property( stream_settings_api.bulk_set_stream_property(
data, data,
$(`#stream_change_property_status${CSS.escape(sub.stream_id)}`), $(e.target).closest(".subsection-parent").find(".alert-notification"),
); );
} }
function stream_setting_changed(e) { function stream_setting_changed(e) {
const sub = get_sub_for_target(e.target); const sub = get_sub_for_target(e.target);
const $status_element = $(`#stream_change_property_status${CSS.escape(sub.stream_id)}`); const $status_element = $(e.target).closest(".subsection-parent").find(".alert-notification");
const setting = e.target.name; const setting = e.target.name;
if (!sub) { if (!sub) {
blueslip.error("undefined sub in stream_setting_changed()"); blueslip.error("undefined sub in stream_setting_changed()");

15
web/templates/stream_settings/stream_settings.hbs
View File

@ -95,11 +95,11 @@
</div> </div>
<div id="personal-stream-settings" class="stream_section" data-stream-section="personal"> <div id="personal-stream-settings" class="stream_section" data-stream-section="personal">
<div class="subsection-header">
<h3 class="stream_setting_subsection_title inline-block">{{t "Personal settings" }}</h3>
<div id="stream_change_property_status{{sub.stream_id}}" class="stream_change_property_status alert-notification"></div>
</div>
<div class="subsection-parent"> <div class="subsection-parent">
<div class="subsection-header">
<h3 class="stream_setting_subsection_title inline-block">{{t "Personal settings" }}</h3>
<div class="stream_change_property_status alert-notification"></div>
</div>
{{#each other_settings}} {{#each other_settings}}
<div class="input-group"> <div class="input-group">
{{> stream_settings_checkbox {{> stream_settings_checkbox
@ -120,9 +120,12 @@
</span> </span>
</div> </div>
</div> </div>
<h4 class="stream_setting_subsection_title">{{t "Notification settings" }}</h4>
<p>{{t "In muted streams, stream notification settings apply only to unmuted topics." }}</p>
<div class="subsection-parent"> <div class="subsection-parent">
<div class="subsection-header">
<h4 class="stream_setting_subsection_title">{{t "Notification settings" }}</h4>
<div class="stream_change_property_status alert-notification"></div>
<p>{{t "In muted streams, stream notification settings apply only to unmuted topics." }}</p>
</div>
<div class="input-group"> <div class="input-group">
<button class="button small rounded reset-stream-notifications-button" type="button">{{t "Reset to default notifications" }}</button> <button class="button small rounded reset-stream-notifications-button" type="button">{{t "Reset to default notifications" }}</button>
</div> </div>