github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-28 17:25:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Conflict error (version was already used)

Browse Source
This commit is contained in:
Robin Ward 2019-05-03 16:36:37 -04:00
parent e8fafbc123
commit 99a2a769d4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/reviewable-flagged-post.js.es6
View File

@ -4,7 +4,7 @@ import { historyHeat } from "discourse/widgets/post-edits-indicator";
import showModal from "discourse/lib/show-modal"; import showModal from "discourse/lib/show-modal";
export default Ember.Component.extend({ 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") @computed("reviewable.post_updated_at")
historyClass(updatedAt) { historyClass(updatedAt) {

8
app/serializers/reviewable_flagged_post_serializer.rb
View File

@ -1,6 +1,10 @@
class ReviewableFlaggedPostSerializer < ReviewableSerializer class ReviewableFlaggedPostSerializer < ReviewableSerializer
target_attributes :cooked, :raw, :reply_count, :version target_attributes :cooked, :raw, :reply_count
attributes :blank_post, :post_updated_at attributes :blank_post, :post_updated_at, :post_version
def post_version
object.target&.version
end
def post_updated_at def post_updated_at
object.target&.updated_at object.target&.updated_at