diff --git a/app/controllers/discusses_controller.rb b/app/controllers/discusses_controller.rb index 1b7147863..ebd3ca251 100644 --- a/app/controllers/discusses_controller.rb +++ b/app/controllers/discusses_controller.rb @@ -97,6 +97,7 @@ class DiscussesController < ApplicationController :root_id => @discuss.root_id || params[:id], :parent_id => params[:id], :praise_count => 0, :challenge_id => @discuss.challenge_id, :dis_id => @discuss.dis_id, :dis_type => @discuss.dis_type, :position => @discuss.position) + @discuss.content = content_safe(@discuss.content) rescue Exception => e uid_logger_error("reply discuss failed : #{e.message}") raise Educoder::TipException.new("回复评论异常") diff --git a/app/views/discusses/reply.json.jbuilder b/app/views/discusses/reply.json.jbuilder index 4024ee7ea..81a22ea17 100644 --- a/app/views/discusses/reply.json.jbuilder +++ b/app/views/discusses/reply.json.jbuilder @@ -1 +1,10 @@ -json.discuss @discuss \ No newline at end of file +json.discuss do + json.id @discuss.id + json.content content_safe(@discuss.content) + json.time time_from_now(@discuss.created_at) + json.position @discuss.position + json.shixun_id @discuss.dis_id + json.hidden @discuss.hidden + json.reward @discuss.reward + json.praise_count discuss.praises_count +end