diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 97d193fbd..b5b3c58b4 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -44,30 +44,29 @@ class CoursesController < ApplicationController @user = User.current @search = params[:search].nil? ? '' : params[:search] @select = params[:select].nil? ? '' : params[:select] - @is_end = params[:is_end].nil? ? 0 : params[:is_end].to_i # 是否归档 @is_over = params[:is_over] # 是否是新建课程页面跳转的查看归档 - @syllabuses_num = Course.where("is_end = #{@is_end} and is_delete = 0").count + @syllabuses_num = Course.where("is_end = 0 and is_delete = 0").count #@syllabus_count = all_syllabuses.count # 我创建的课堂 create_syllabuses = Course.where(:tea_id => @user.id) # 我参与的课堂 join_syllabuses = @user.courses.where("is_delete = 0 and tea_id != #{@user.id}") - @join_syllabuses_count = join_syllabuses.where(:is_end => @is_end, :is_delete => 0).count - @create_syllabuses_count = create_syllabuses.where(:is_end => @is_end, :is_delete => 0).count + @join_syllabuses_count = join_syllabuses.where(:is_end => 0, :is_delete => 0).count + @create_syllabuses_count = create_syllabuses.where(:is_end => 0, :is_delete => 0).count # 页面筛选的课程 if @select == "create" - @syllabuses = create_syllabuses.where("is_end = #{@is_end} and is_delete = 0 and name like '%#{@search}%'") + @syllabuses = create_syllabuses.where("is_end = 0 and is_delete = 0 and name like '%#{@search}%'") elsif @select == "join" - @syllabuses = join_syllabuses.where("is_end = #{@is_end} and is_delete = 0 and tea_id != #{@user.id} and name like '%#{@search}%'") + @syllabuses = join_syllabuses.where("is_end = 0 and is_delete = 0 and tea_id != #{@user.id} and name like '%#{@search}%'") elsif @select == "end" # 归档的课堂 - end_syllabuses = Course.where("is_end = #{@is_end} and name like '%#{@search}%'") + end_syllabuses = Course.where("is_end = 1 and name like '%#{@search}%'") @syllabuses = end_syllabuses else # 全部课堂 - all_syllabuses = Course.where("is_end = #{@is_end} and is_delete = 0 and name like '%#{@search}%'") + all_syllabuses = Course.where("is_end = 0 and is_delete = 0 and name like '%#{@search}%'") @syllabuses = all_syllabuses end diff --git a/app/views/courses/_course_index_search.html.erb b/app/views/courses/_course_index_search.html.erb index 3c07cd79c..ddabac1ac 100644 --- a/app/views/courses/_course_index_search.html.erb +++ b/app/views/courses/_course_index_search.html.erb @@ -1,4 +1,4 @@ -
+
diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb index 49dd1a06e..4036e3af8 100644 --- a/app/views/courses/index.html.erb +++ b/app/views/courses/index.html.erb @@ -13,10 +13,10 @@