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 diff --git a/app/controllers/ec_years_controller.rb b/app/controllers/ec_years_controller.rb index 7d696a2b..4661fd7b 100644 --- a/app/controllers/ec_years_controller.rb +++ b/app/controllers/ec_years_controller.rb @@ -31,12 +31,10 @@ class EcYearsController < ApplicationController end @status = 1 end - @major_manager = User.current.admin? || - @major_school.school.ec_school_users.pluck(:user_id).include?(User.current.id) || - @major_school.ec_major_school_users.pluck(:user_id).include?(User.current.id) + @major_manager = true @btn_text = @major_school.template_major && User.current.admin? ? "立即配置" : (!@major_school.template_major && @major_manager ? "立即配置" : "查看") - @years = @major_school.ec_years + @years = EcYear.where(:ec_major_school_id => @major_school.id) @years = paginateHelper @years, 10 respond_to do |format| format.js diff --git a/app/views/common/index.html.erb b/app/views/common/index.html.erb index 293b0f4b..05714463 100644 --- a/app/views/common/index.html.erb +++ b/app/views/common/index.html.erb @@ -1 +1 @@ -
\n 课程体系 >\n {schooldata.ec_course_name}\n {/*课程考核方式与数据来源*/}\n {/* */}\n {/* 导出培养目标 */}\n 关联课堂\n 取消关联\n \n 导出考核方法\n \n
\n\n\n 项\n 名称\n 考核次数\n 支撑关系\n 考核分项名称\n \n {/* 操作 */}\n {ecmanager===false?\"\":\n \n \n }\n \n\n \n 成绩导入状态\n \n \n 成绩来源\n \n \n 平均成绩导入模板\n \n \n 明细成绩导入模板\n \n
\n\n 课程体系 >\n {schooldata.ec_course_name}\n {/*课程考核方式与数据来源*/}\n {/* */}\n {/* 导出培养目标 */}\n 关联课堂\n 取消关联\n \n 导出考核方法\n \n
\n\n\n 项\n 名称\n 考核次数\n 支撑关系\n 考核分项名称\n \n {/* 操作 */}\n {ecmanager===false?\"\":\n \n \n }\n \n\n \n 成绩导入状态\n \n \n 成绩来源\n \n \n 平均成绩导入模板\n \n \n 明细成绩导入模板\n \n
\n