Revert "Only send can_have_answer attribute if empty_box_on_unsolved is true"
This reverts commit ea8c94681b
.
This commit is contained in:
parent
f17d8ca52e
commit
d8f0b310f7
12
plugin.rb
12
plugin.rb
|
@ -340,20 +340,16 @@ SQL
|
|||
require_dependency 'topic_list_item_serializer'
|
||||
|
||||
class ::TopicListItemSerializer
|
||||
attributes :has_accepted_answer
|
||||
attributes :has_accepted_answer, :can_have_answer
|
||||
|
||||
def has_accepted_answer
|
||||
object.custom_fields["accepted_answer_post_id"] ? true : false
|
||||
end
|
||||
|
||||
if SiteSetting.empty_box_on_unsolved
|
||||
attributes :can_have_answer
|
||||
def can_have_answer
|
||||
return true if SiteSetting.allow_solved_on_all_topics
|
||||
|
||||
def can_have_answer
|
||||
return true if SiteSetting.allow_solved_on_all_topics
|
||||
|
||||
return scope.allow_accepted_answers_on_category?(object.category_id)
|
||||
end
|
||||
return scope.allow_accepted_answers_on_category?(object.category_id)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue