@ -112,7 +112,8 @@ class CoursesController < ApplicationController
videos = custom_sort(videos, params[:sort_by], params[:sort_direction])
@count = videos.count
@videos = paginate videos.includes(video: [user: :user_extension], user: :user_extension)
sql = "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)
end
def delete_course_video
@ -1,5 +1,4 @@
json.extract! video, :id, :title, :cover_url, :file_url, :play_url, :vv, :user_id, :transcoded
json.play_duration video.video_play_duration
json.published_at video.display_published_at
json.created_at video.display_created_at