From 2275d303ff8484d6416da5810daf0abab7c04942 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 10 Mar 2020 12:15:46 +0800 Subject: [PATCH 1/5] 1 --- app/controllers/courses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index c9fcb38ac..0f54adbc0 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -113,7 +113,7 @@ 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 = videos.joins(sql).reload! @videos = paginate videos.includes(video: [user: :user_extension], user: :user_extension) end From 757f5aaa62e78d171a2ec2ac15c6b4aef84178e9 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 10 Mar 2020 12:55:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A7=86=E9=A2=91=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 0f54adbc0..c20f77113 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -112,9 +112,11 @@ 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! + #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 = paginate videos.includes(video: [user: :user_extension], user: :user_extension) + .where(videos: {transcoded: true}).or(videos: {user_id: current_user.id}) + .or(course_videos: {is_link: true}) end def delete_course_video From db6af4f42176d20651ae0554e41b3a30c401cedc Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 10 Mar 2020 12:59:20 +0800 Subject: [PATCH 3/5] 1 --- app/controllers/courses_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index c20f77113..db05ea7b5 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -114,9 +114,9 @@ class CoursesController < ApplicationController @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 = paginate videos.joins(sql).includes(video: [user: :user_extension], user: :user_extension) - @videos = paginate videos.includes(video: [user: :user_extension], user: :user_extension) - .where(videos: {transcoded: true}).or(videos: {user_id: current_user.id}) - .or(course_videos: {is_link: true}) + @videos = paginate videos.includes(:video) + .where(video: {transcoded: true}).or(video: {user_id: current_user.id}) + .or(video: {is_link: true}) end def delete_course_video From ec64e8fd37a2cdf5d2284ef84b27f90b09e0c788 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 10 Mar 2020 13:05:02 +0800 Subject: [PATCH 4/5] 1 --- app/controllers/courses_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index db05ea7b5..d309fef93 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -114,9 +114,10 @@ class CoursesController < ApplicationController @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 = paginate videos.joins(sql).includes(video: [user: :user_extension], user: :user_extension) - @videos = paginate videos.includes(:video) - .where(video: {transcoded: true}).or(video: {user_id: current_user.id}) - .or(video: {is_link: true}) + videos = videos.includes(video: [user: :user_extension], user: :user_extension) + @videos = paginate videos.where(video: {transcoded: true}) + .or(videos.where(video: {user_id: current_user.id})) + .or(videos.where(course_videos: {is_link: true})) end def delete_course_video From 9e9d39d64442804103fa5304e1f4cce4f718f35b Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 10 Mar 2020 13:06:03 +0800 Subject: [PATCH 5/5] 1 --- app/controllers/courses_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index d309fef93..129404647 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -115,8 +115,8 @@ class CoursesController < ApplicationController #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(video: {transcoded: true}) - .or(videos.where(video: {user_id: current_user.id})) + @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