From 45296a8fe9109a7546b638edb37422ac92d2c78b Mon Sep 17 00:00:00 2001 From: Jeff Wong Date: Mon, 30 Mar 2020 15:23:16 -0700 Subject: [PATCH] FIX: backport reviewable topic claim not being shown correctly --- .../discourse/components/reviewable-item.js.es6 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/components/reviewable-item.js.es6 b/app/assets/javascripts/discourse/components/reviewable-item.js.es6 index f998452e33..c301f1aa93 100644 --- a/app/assets/javascripts/discourse/components/reviewable-item.js.es6 +++ b/app/assets/javascripts/discourse/components/reviewable-item.js.es6 @@ -22,10 +22,13 @@ export default Component.extend({ return type.dasherize(); }, - @discourseComputed("reviewable.topic", "reviewable.removed_topic_id") - topicId(topic, removedTopicId) { - let topicId = topic ? topic.id : null; - return topicId || removedTopicId; + @discourseComputed( + "reviewable.topic", + "reviewable.topic_id", + "reviewable.removed_topic_id" + ) + topicId(topic, topicId, removedTopicId) { + return (topic && topic.id) || topicId || removedTopicId; }, @discourseComputed("siteSettings.reviewable_claiming", "topicId")