From 65ccd40ed1f021e882cf869d6721092e4aebed63 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 9 Mar 2020 14:25:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=AE=E5=BD=95=E7=9A=84?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/courses_controller.rb | 7 ++++++-
app/helpers/courses_helper.rb | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 8d2c3579a..638df8007 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -102,8 +102,13 @@ class CoursesController < ApplicationController
end
def course_videos
- logger.info("########[#{@course}")
videos = @course.videos
+ if params[:category_id].present? && params[:category_id].to_i != 0
+ videos = videos.where(course_second_category_id: params[:category_id].to_i)
+ end
+ @category = @main_category.course_second_categories.find_by(id: params[:category])
+ tip_exception("子目录id有误") if !@category.present?
+
videos = custom_sort(videos, params[:sort_by], params[:sort_direction])
@count = videos.count
@videos = paginate videos.includes(user: :user_extension)
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 8eb608a24..e9d6e4b06 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -80,7 +80,7 @@ module CoursesHelper
when "statistics"
"/courses/#{course.id}/statistics"
when "video"
- "/courses/#{course.id}/course_videos/#{mod.id}"
+ "/courses/#{course.id}/course_videos"
end
end