From 3424be695efece3b9d77dd7b75744cf1ad6606f0 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 8 Mar 2016 09:12:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=EF=BC=9A=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=9A=84=E5=BC=B9=E6=A1=86=E4=B8=AD=EF=BC=8C=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=B7=B2=E7=BB=8F=E5=88=A0=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 209c5370d..921262106 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -425,9 +425,9 @@ class UsersController < ApplicationController homework = HomeworkCommon.find params[:homework].to_i if !params[:search].nil? search = "%#{params[:search].to_s.strip.downcase}%" - @course = @user.courses.where("#{Course.table_name}.id != #{homework.course_id} and #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search).select { |course| @user.allowed_to?(:as_teacher,course)} + @course = @user.courses.where("is_delete = 0 and #{Course.table_name}.id != #{homework.course_id} and #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search).select { |course| @user.allowed_to?(:as_teacher,course)} else - @course = @user.courses.where("#{Course.table_name}.id != #{homework.course_id}").select { |course| @user.allowed_to?(:as_teacher,course)} + @course = @user.courses.where("is_delete = 0 and #{Course.table_name}.id != #{homework.course_id}").select { |course| @user.allowed_to?(:as_teacher,course)} end @search = params[:search] #这里仅仅是传递需要发送的资源id