github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 07:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Report edit conflicts when saving draft. (#6585)

Browse Source
This commit is contained in:
Bianca Nenciu
2018-11-14 13:56:25 +02:00
committed by Régis Hanol
parent d078808144
commit 34e4d82f1a
6 changed files with 69 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/draft_controller.rb
View File

@ -10,6 +10,15 @@ class DraftController < ApplicationController
def update
Draft.set(current_user, params[:draft_key], params[:sequence].to_i, params[:data])
if params[:post_id] && params[:original_text]
post = Post.find_by(id: params[:post_id])
if post && post.raw != params[:original_text]
conflict_user = BasicUserSerializer.new(post.last_editor, root: false)
return render json: success_json.merge(conflict_user: conflict_user)
end
end
render json: success_json
end