|
|
|
|
@ -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
|
|
|
|
|
|
|
|
|
|
|
