Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/courses_controller.rb

@@ -112,9 +112,12 @@ class CoursesController < ApplicationController
 
     videos = custom_sort(videos, params[:sort_by], params[:sort_direction])
     @count  = videos.count
-    sql = "left join videos on videos.id=course_videos.video_id AND (videos.transcoded=1 OR videos.user_id = #{current_user.id})"
-    videos = videos.joins(sql).reload
-    @videos = paginate videos.includes(video: [user: :user_extension], user: :user_extension)
+    #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(videos: {transcoded: true})
+                           .or(videos.where(videos: {user_id: current_user.id}))
+                           .or(videos.where(course_videos: {is_link: true}))
   end
 
   def delete_course_video