From 88972c60a6b7b957b31a27319d35ffd988b1404d Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 21 Mar 2019 10:47:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 4 ++-- app/controllers/ec_courses_controller.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index ce827d25..5e4be042 100644 --- a/Gemfile +++ b/Gemfile @@ -15,8 +15,6 @@ unless RUBY_PLATFORM =~ /w32/ gem 'rqrcode_png' gem 'roo-xls' gem 'newrelic_rpm' - gem 'seventeen_mon' - gem 'mobinfo' end gem 'certified' gem 'net-ssh', '2.9.1' @@ -24,6 +22,8 @@ unless RUBY_PLATFORM =~ /w32/ gem 'nokogiri' end +gem 'seventeen_mon' +gem 'mobinfo' gem 'simple_xlsx_reader' gem 'wechat',path: 'lib/wechat' gem 'grack', path:'lib/grack' diff --git a/app/controllers/ec_courses_controller.rb b/app/controllers/ec_courses_controller.rb index df8c24b8..f263369d 100644 --- a/app/controllers/ec_courses_controller.rb +++ b/app/controllers/ec_courses_controller.rb @@ -3,8 +3,8 @@ class EcCoursesController < ApplicationController layout 'base_ec' before_filter :find_ec_course, :except => [:create, :get_calculation_data, :sync_all_course_data] before_filter :find_year, :only => [:create, :get_calculation_data] - before_filter :require_login - before_filter :ec_auth, :except => [:sync_all_course_data] + before_filter :require_login, :except => [:sync_all_course_data] + before_filter :ec_auth, :except => [:search_courses] skip_before_filter :verify_authenticity_token, :only => [:crud_targets, :crud_score_level, :sync_all_course_data, :search_courses, :correlation_course, :delete_course] @@ -349,11 +349,11 @@ class EcCoursesController < ApplicationController if user.try(:admin?) courses = Course.where(:is_delete => 0) else - course_ids = Member.where("user_id = #{params[:user_id]} and course_id != -1").pluck(:course_id) + course_ids = Member.where("user_id = #{user.try(:id)} and course_id != -1").pluck(:course_id) courses = Course.where(:is_delete => 0, :id => course_ids) end if params[:search] && params[:search].strip != "" - courses = courses.where("name like '%#{params[:search].strip}%'").reorder("created_at desc") + courses = courses.where("name like ?", "%#{params[:search].strip}%").reorder("created_at desc") else courses = courses.reorder("created_at desc") end