From ab37080796ce9052290cfba9b026b35b2d2d1cf3 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 10 Mar 2020 17:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=A7=86=E9=A2=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/weapps/courses_controller.rb         | 10 ++++++++++
 app/views/weapps/courses/course_videos.json.jbuilder |  4 ++++
 config/routes.rb                                     |  1 +
 3 files changed, 15 insertions(+)
 create mode 100644 app/views/weapps/courses/course_videos.json.jbuilder

diff --git a/app/controllers/weapps/courses_controller.rb b/app/controllers/weapps/courses_controller.rb
index e1ceb6fd3..c4dde41e0 100644
--- a/app/controllers/weapps/courses_controller.rb
+++ b/app/controllers/weapps/courses_controller.rb
@@ -48,6 +48,16 @@ class Weapps::CoursesController < Weapps::BaseController
     render_error(ex.message)
   end
 
+  def course_videos
+    videos = @course.videos.where(transcoded: true)
+    videos = custom_sort(videos, params[:sort_by], params[:sort_direction])
+    #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(user: :user_extension)
+    @count = videos.count
+    @videos = paginate videos
+  end
+
   def basic_info
     @course = current_course
   end
diff --git a/app/views/weapps/courses/course_videos.json.jbuilder b/app/views/weapps/courses/course_videos.json.jbuilder
new file mode 100644
index 000000000..e14e4f5d8
--- /dev/null
+++ b/app/views/weapps/courses/course_videos.json.jbuilder
@@ -0,0 +1,4 @@
+json.count @count
+json.videos @videos do |video|
+    json.partial! 'users/videos/video', locals: { video: video.video }
+end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 9c6b73ddc..db9b74bd2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1055,6 +1055,7 @@ Rails.application.routes.draw do
           get :course_groups
           get :basic_info
           get :course_activities
+          get :course_videos
           post :change_member_roles
           delete :delete_course_teachers
           delete :delete_course_students