|
|
|
@ -114,7 +114,7 @@ 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.joins(:video).select("course_videos.id, course_videos.title, course_videos.link, course_videos.user_id, course_videos.video_id")
|
|
|
|
|
videos = videos.joins(:video).select("course_videos.id, course_videos.title, course_videos.link, course_videos.is_link,course_videos.user_id, course_videos.video_id")
|
|
|
|
|
videos = videos.where(videos: {transcoded: true})
|
|
|
|
|
.or(videos.where(videos: {user_id: current_user.id}))
|
|
|
|
|
.or(videos.where(course_videos: {is_link: true})).includes(video: [user: :user_extension], user: :user_extension)
|
|
|
|
|