From 9e9d39d64442804103fa5304e1f4cce4f718f35b Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 10 Mar 2020 13:06:03 +0800 Subject: [PATCH] 1 --- app/controllers/courses_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index d309fef93..129404647 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -115,8 +115,8 @@ class CoursesController < ApplicationController #sql = "left join videos on videos.id=course_videos.video_id AND (videos.transcoded=1 OR videos.user_id = #{current_user.id})" #@videos = paginate videos.joins(sql).includes(video: [user: :user_extension], user: :user_extension) videos = videos.includes(video: [user: :user_extension], user: :user_extension) - @videos = paginate videos.where(video: {transcoded: true}) - .or(videos.where(video: {user_id: current_user.id})) + @videos = paginate videos.where(videos: {transcoded: true}) + .or(videos.where(videos: {user_id: current_user.id})) .or(videos.where(course_videos: {is_link: true})) end