A platform for community discussion. Free, open, simple.
FIX: Show solved status on topic titles loaded directly (#41186)
overgrow8cb3e97e470f
diff --git a/plugins/discourse-solved/lib/discourse_solved/topic_view_serializer_extension.rb b/plugins/discourse-solved/lib/discourse_solved/topic_view_serializer_extension.rbindex 42458465526..a56d96371d9 100644--- a/plugins/discourse-solved/lib/discourse_solved/topic_view_serializer_extension.rb+++ b/plugins/discourse-solved/lib/discourse_solved/topic_view_serializer_extension.rb@@ -3,7 +3,7 @@module DiscourseSolved::TopicViewSerializerExtensionextend ActiveSupport::Concern- prepended { attributes :accepted_answers }+ prepended { attributes :accepted_answers, :has_accepted_answer }def include_accepted_answers?SiteSetting.solved_enabled? && object.topic.topic_answers.any?@@ -12,4 +12,12 @@ module DiscourseSolved::TopicViewSerializerExtensiondef accepted_answersDiscourseSolved::AcceptedAnswersHelper.serialize(object.topic, scope)end++ def include_has_accepted_answer?+ SiteSetting.solved_enabled?+ end++ def has_accepted_answer+ object.topic.topic_answers.any?+ endenddiff --git a/plugins/discourse-solved/spec/serializers/topic_view_serializer_spec.rb b/plugins/discourse-solved/spec/serializers/topic_view_serializer_spec.rbindex a1b698b2531..8709181b326 100644--- a/plugins/discourse-solved/spec/serializers/topic_view_serializer_spec.rb+++ b/plugins/discourse-solved/spec/serializers/topic_view_serializer_spec.rb@@ -51,4 +51,25 @@ describe TopicViewSerializer doendendend++ describe "#has_accepted_answer" do+ it "is true when the topic has an accepted answer" do+ Fabricate(:solved_topic, topic: topic, answer_post: post2)+ serializer = TopicViewSerializer.new(TopicView.new(topic), scope: Guardian.new(user))+ expect(serializer.as_json[:topic_view][:has_accepted_answer]).to eq(true)+ end++ it "is false when the topic has no accepted answer" do+ unsolved_topic = Fabricate(:topic)+ serializer = TopicViewSerializer.new(TopicView.new(unsolved_topic), scope: Guardian.new(user))+ expect(serializer.as_json[:topic_view][:has_accepted_answer]).to eq(false)+ end++ it "is not included when solved is disabled" do+ SiteSetting.solved_enabled = false+ Fabricate(:solved_topic, topic: topic, answer_post: post2)+ serializer = TopicViewSerializer.new(TopicView.new(topic), scope: Guardian.new(user))+ expect(serializer.as_json[:topic_view]).not_to have_key(:has_accepted_answer)+ end+ endend