paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-21 15:09:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

message_edit: Fix message editing for messages that threw a backend error.

Browse Source 
Changes editibility type from NONE to FULL, and makes Save and Cancel
buttons work. Exposes a new bug, which is that changing the topic changes
the topic for the recipient row, rather than the message. See #2278.
This commit is contained in:
Rishi Gupta
2016-11-10 12:17:30 -08:00
committed by Tim Abbott
parent 3c75ef2d79
commit eeca06ea08
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
static/js/message_edit.js
View File

@@ -18,8 +18,16 @@ exports.editability_types = editability_types;
function get_editability (message, edit_limit_seconds_buffer) { function get_editability (message, edit_limit_seconds_buffer) {
edit_limit_seconds_buffer = edit_limit_seconds_buffer || 0; edit_limit_seconds_buffer = edit_limit_seconds_buffer || 0;
if (!message || !message.sent_by_me || message.local_id !== undefined || if (!(message && message.sent_by_me)) {
!page_params.realm_allow_message_editing) { return editability_types.NO;
}
if (message.failed_request) {
return editability_types.FULL;
}
if (message.local_id !== undefined) {
return editability_types.NO;
}
if (!page_params.realm_allow_message_editing) {
return editability_types.NO; return editability_types.NO;
} }
if (page_params.realm_message_content_edit_limit_seconds === 0) { if (page_params.realm_message_content_edit_limit_seconds === 0) {
@@ -68,6 +76,7 @@ exports.save = function (row, from_topic_edited_only) {
if (message.local_id !== undefined) { if (message.local_id !== undefined) {
if (new_content !== message.raw_content || topic_changed) { if (new_content !== message.raw_content || topic_changed) {
echo.edit_locally(message, new_content, topic_changed ? new_topic : undefined); echo.edit_locally(message, new_content, topic_changed ? new_topic : undefined);
row = current_msg_list.get_row(message_id);
} }
message_edit.end(row); message_edit.end(row);
return; return;