From 09a4b41381bee802bfb48a56f5fbf17420f2aae0 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 8 Jun 2017 09:45:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=B5=84=E6=BA=90=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=8F=AD=E7=BA=A7=E6=95=B0=E6=8D=AE=E6=9C=89=E7=BC=BA?= =?UTF-8?q?=E5=A4=B1=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=89=BE=E5=88=B0=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E7=9A=84=E7=8F=AD=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- app/models/course.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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) }