From 5f556264c810cbad55449574ee545c3ac2c90723 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 23 Dec 2019 12:48:13 +0800 Subject: [PATCH] hack --- app/controllers/comments_controller.rb | 3 +-- app/views/comments/index.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 2157159e2..850886e68 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -32,8 +32,7 @@ class CommentsController < ApplicationController # 列表 def index - logger.info("##########hack:#{@hack.id}") - discusses = Discuss.where(root_id: nil, dis_id: @hack.id, dis_type: @hack.class.to_s) + discusses = @hack.discusses.where(root_id: nil) @discusses_count = discusses.count @discusses= paginate discusses end diff --git a/app/views/comments/index.json.jbuilder b/app/views/comments/index.json.jbuilder index a5bc6cc28..b176d00b9 100644 --- a/app/views/comments/index.json.jbuilder +++ b/app/views/comments/index.json.jbuilder @@ -1,4 +1,4 @@ -json.disscuss_count @discusses +json.disscuss_count @discusses_count json.comments @discusses do |discuss| json.partial! 'comments/discuss', locals: { discuss: discuss} json.children discuss.child_discuss(current_user) do |c_d|