From d361e6a18bb771051cb088340cce787820ec1d71 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 14 Jan 2020 20:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=9A=84=E6=B6=88?=
=?UTF-8?q?=E6=B6=88=E6=81=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/discusses_controller.rb | 2 +-
app/controllers/games_controller.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/discusses_controller.rb b/app/controllers/discusses_controller.rb
index bcbba1a3a..3b1dff96b 100644
--- a/app/controllers/discusses_controller.rb
+++ b/app/controllers/discusses_controller.rb
@@ -11,9 +11,9 @@ class DiscussesController < ApplicationController
# 总数，分页使用
if @manger
- @disscuss_count = Discuss.where(:dis_id => @container.id, :dis_type => @container.class.to_s, :root_id => nil).count
disscusses = Discuss.where(:dis_id => @container.id, :dis_type => @container.class.to_s,
:root_id => nil)
+ @disscuss_count = disscusses.count
@discusses = disscusses.joins("left join games on discusses.challenge_id = games.challenge_id and discusses.user_id = games.user_id")
.select("discusses.*, games.identifier").includes(:user, :praise_treads).limit(LIMIT).offset(offset)
else
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 055c656eb..fcdd81953 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -26,7 +26,7 @@ class GamesController < ApplicationController
game_count = Game.where(myshixun_id: @game.myshixun_id).count
discusses = @shixun.discusses
- discusses = discusses.where('hidden = false OR user_id = :user_id', user_id: current_user.id) unless current_user.admin?
+ discusses = discusses.where('hidden = false OR user_id = :user_id', user_id: current_user.id) unless current_user.admin_or_business?
discusses_count = discusses.count
@user = @game.owner