From d0cf9c258b81b781412f897d4a7d219039411814 Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Mon, 18 Mar 2019 18:02:55 +0530 Subject: [PATCH] FIX: Include the serializer fields only if plugin is enabled --- app/serializers/concerns/topic_answer_mixin.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/serializers/concerns/topic_answer_mixin.rb b/app/serializers/concerns/topic_answer_mixin.rb index 23c8a22..a767ab9 100644 --- a/app/serializers/concerns/topic_answer_mixin.rb +++ b/app/serializers/concerns/topic_answer_mixin.rb @@ -7,6 +7,10 @@ module TopicAnswerMixin object.custom_fields["accepted_answer_post_id"] ? true : false end + def include_has_accepted_answer? + SiteSetting.solved_enabled + end + def can_have_answer return true if SiteSetting.allow_solved_on_all_topics return false if object.closed || object.archived @@ -14,6 +18,6 @@ module TopicAnswerMixin end def include_can_have_answer? - SiteSetting.empty_box_on_unsolved + SiteSetting.solved_enabled && SiteSetting.empty_box_on_unsolved end end