From b9f78aa85d3b922dc8f33deba24fddf9808cf80e Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 3 Mar 2020 14:45:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9A=84=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb       | 2 +-
 app/views/users/videos/_video.json.jbuilder | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index fd2d25dd5..ef6a30d35 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -106,7 +106,7 @@ class CoursesController < ApplicationController
     videos = @course.videos
     videos = custom_sort(videos, params[:sort_by], params[:sort_direction])
     @count  = videos.count
-    @videos = paginate videos
+    @videos = paginate videos.includes(user: :user_extension)
   end
 
   def delete_course_video
diff --git a/app/views/users/videos/_video.json.jbuilder b/app/views/users/videos/_video.json.jbuilder
index 1e09ca4b9..dcf85fb75 100644
--- a/app/views/users/videos/_video.json.jbuilder
+++ b/app/views/users/videos/_video.json.jbuilder
@@ -3,4 +3,8 @@ json.extract! video, :id, :title, :cover_url, :file_url, :play_url, :vv, :user_i
 json.play_duration video.video_play_duration
 json.published_at video.display_published_at
 json.created_at video.display_created_at
-json.updated_at video.display_updated_at
\ No newline at end of file
+json.updated_at video.display_updated_at
+user = video.user
+json.user_name user&.real_name
+json.user_img url_to_avatar(user)
+json.user_login user&.login
\ No newline at end of file