From 99a2a769d4b030c6bcc759503b9fed774b4404f6 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 3 May 2019 16:36:37 -0400 Subject: [PATCH] FIX: Conflict error (version was already used) --- .../discourse/components/reviewable-flagged-post.js.es6 | 2 +- app/serializers/reviewable_flagged_post_serializer.rb | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6 b/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6 index 05e8411a76b..1916a961253 100644 --- a/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6 +++ b/app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6 @@ -4,7 +4,7 @@ import { historyHeat } from "discourse/widgets/post-edits-indicator"; import showModal from "discourse/lib/show-modal"; export default Ember.Component.extend({ - hasEdits: Ember.computed.gt("reviewable.version", 1), + hasEdits: Ember.computed.gt("reviewable.post_version", 1), @computed("reviewable.post_updated_at") historyClass(updatedAt) { diff --git a/app/serializers/reviewable_flagged_post_serializer.rb b/app/serializers/reviewable_flagged_post_serializer.rb index 2f32b9088c0..d4e8c8111ce 100644 --- a/app/serializers/reviewable_flagged_post_serializer.rb +++ b/app/serializers/reviewable_flagged_post_serializer.rb @@ -1,6 +1,10 @@ class ReviewableFlaggedPostSerializer < ReviewableSerializer - target_attributes :cooked, :raw, :reply_count, :version - attributes :blank_post, :post_updated_at + target_attributes :cooked, :raw, :reply_count + attributes :blank_post, :post_updated_at, :post_version + + def post_version + object.target&.version + end def post_updated_at object.target&.updated_at