From 6962b0f64f77c43a733f0f86611304656524f6f8 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 15 Nov 2019 09:43:34 +0800 Subject: [PATCH] laboratory: fix competition --- app/controllers/competitions/competitions_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/competitions/competitions_controller.rb b/app/controllers/competitions/competitions_controller.rb index 1da236856..32996994e 100644 --- a/app/controllers/competitions/competitions_controller.rb +++ b/app/controllers/competitions/competitions_controller.rb @@ -9,7 +9,8 @@ class Competitions::CompetitionsController < Competitions::BaseController def index # 已上架 或者 即将上架 - competitions = current_laboratory.competitions.where(status: true).or(Competition.where.not(published_at: nil)) + competitions = current_laboratory.competitions + competitions = competitions.where(status: true).or(competitions.where.not(published_at: nil)) competitions = case params[:category]