paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 16:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

message_move: Show "general chat" in link of confirmation toast.

Browse Source 
When a message is moved using the "Move only this message" option
a confirmation toast is shown. This commit adds support to show
"general chat" in link of the toast when a message is moved to it.
This commit is contained in:
Saubhagya Patel
2025-03-27 15:54:29 +05:30
committed by Tim Abbott
parent 13bd8771f9
commit 939691dfed
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web/src/message_edit.ts
View File

@@ -1590,7 +1590,8 @@ type ToastParams = {
function show_message_moved_toast(toast_params: ToastParams): void { function show_message_moved_toast(toast_params: ToastParams): void {
const new_stream_name = sub_store.maybe_get_stream_name(toast_params.new_stream_id); const new_stream_name = sub_store.maybe_get_stream_name(toast_params.new_stream_id);
const stream_topic = `#${new_stream_name} > ${toast_params.new_topic_name}`; const new_topic_display_name = util.get_final_topic_display_name(toast_params.new_topic_name);
const is_empty_string_topic = toast_params.new_topic_name === "";
const new_location_url = hash_util.by_stream_topic_url( const new_location_url = hash_util.by_stream_topic_url(
toast_params.new_stream_id, toast_params.new_stream_id,
toast_params.new_topic_name, toast_params.new_topic_name,
@@ -1598,8 +1599,10 @@ function show_message_moved_toast(toast_params: ToastParams): void {
feedback_widget.show({ feedback_widget.show({
populate($container) { populate($container) {
const widget_body_html = render_message_moved_widget_body({ const widget_body_html = render_message_moved_widget_body({
stream_topic, new_stream_name,
new_topic_display_name,
new_location_url, new_location_url,
is_empty_string_topic,
}); });
$container.html(widget_body_html); $container.html(widget_body_html);
}, },

10
web/templates/message_moved_widget_body.hbs
View File

@@ -1,6 +1,12 @@
<div> <div>
{{#tr}} {{#tr}}
Message moved to <z-link>{stream_topic}</z-link>. Message moved to <z-link></z-link>.
{{#*inline "z-link"}}<a class="white-space-preserve-wrap" href="{{new_location_url}}">{{> @partial-block}}</a>{{/inline}} {{#*inline "z-link"~}}
<a class="white-space-preserve-wrap" href="{{new_location_url}}">
{{~!-- squash whitespace --~}}
#{{new_stream_name}} &gt; <span {{#if is_empty_string_topic}}class="empty-topic-display"{{/if}}>{{new_topic_display_name}}</span>
{{~!-- squash whitespace --~}}
</a>
{{~/inline}}
{{/tr}} {{/tr}}
</div> </div>