diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 54dd8c081..d24cc8af5 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2107,7 +2107,7 @@ class UsersController < ApplicationController fan_query = @user.watcher_users; @user_fanlist_count = fan_query.count(); @user_fanlist = fan_query.order("#{Watcher.table_name}.id desc").limit(12); - @courses = @user.courses.visible.not_deleted + @courses = @user.courses.visible.not_deleted_not_end @courses_count = @courses.count @courses = @courses.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc").limit(8) if @user == User.current diff --git a/app/models/course.rb b/app/models/course.rb index f2172f419..96e7f2606 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -109,7 +109,7 @@ class Course < ActiveRecord::Base acts_as_customizable scope :not_deleted, lambda{where(is_delete: 0)} - scope :not_deleted_not_end, lambda{where(is_delete: 0, is_end: 1)} + scope :not_deleted_not_end, lambda{where(is_delete: 0, is_end: 0)} scope :not_deleted_but_is_end, lambda{where(is_end: 1, is_delete: 0)} scope :all_course scope :active, lambda { where(:status => STATUS_ACTIVE) }