From 72706e00263140e89b0d180a72ce08310422a9bc Mon Sep 17 00:00:00 2001 From: anke1460 Date: Tue, 17 Mar 2020 22:31:20 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=80=81=E5=B8=88=E7=AB=AF=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/course_videos_controller.rb | 2 +- app/views/course_videos/watch_histories.json.jbuilder | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/course_videos_controller.rb b/app/controllers/course_videos_controller.rb index 3a0b09b4e..c36472de4 100644 --- a/app/controllers/course_videos_controller.rb +++ b/app/controllers/course_videos_controller.rb @@ -35,7 +35,7 @@ class CourseVideosController < ApplicationController @watch_course_videos = @watch_course_videos.where("course_members.course_group_id = ?", params[:group_id]) end - @watch_course_videos = @watch_course_videos.select("count(watch_course_videos.course_video_id) AS freq, watch_course_videos.*") + @watch_course_videos = @watch_course_videos.select("count(watch_course_videos.course_video_id) AS freq, watch_course_videos.id, watch_course_videos.user_id, watch_course_videos.start_at, watch_course_videos.end_at, watch_course_videos.is_finished, watch_course_videos.total_duration") if params[:order].present? key = params[:order].split("-") diff --git a/app/views/course_videos/watch_histories.json.jbuilder b/app/views/course_videos/watch_histories.json.jbuilder index 2babab5d0..fc79f711e 100644 --- a/app/views/course_videos/watch_histories.json.jbuilder +++ b/app/views/course_videos/watch_histories.json.jbuilder @@ -1,5 +1,6 @@ json.data do json.array! @watch_course_videos do |d| + json.id d.id json.user_name d.user&.real_name json.is_finished d.is_finished ? true : false json.total_duration d.total_duration.round(0)