From 2461351ce7bcdbb8dc2529d2e96de5157b9699d4 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 22 Aug 2019 13:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E8=AE=BE=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=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    | 1 +
 app/models/course.rb                     | 2 +-
 app/views/courses/settings.json.jbuilder | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 14276b4dd..ce6c7f601 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -117,6 +117,7 @@ class CoursesController < ApplicationController
   # Get /courses/:id/settings
   # Edit Page
   def settings
+    @course_modules = @course.course_modules.where.not(module_type: 'activity')
   end
 
   # POST /courses
diff --git a/app/models/course.rb b/app/models/course.rb
index baed1efe6..b46464ea6 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -185,7 +185,7 @@ class Course < ApplicationRecord
   end
 
   def all_course_module_types
-    %w[activity announcement online_learning shixun_homework common_homework group_homework graduation exercise poll attachment board course_group]
+    %w[activity announcement online_learning shixun_homework common_homework group_homework exercise attachment course_group graduation poll board]
   end
 
   def get_course_module_by_type(type)
diff --git a/app/views/courses/settings.json.jbuilder b/app/views/courses/settings.json.jbuilder
index 376dc6f6d..27dc9aac4 100644
--- a/app/views/courses/settings.json.jbuilder
+++ b/app/views/courses/settings.json.jbuilder
@@ -9,7 +9,11 @@ json.start_date @course.start_date
 json.end_date @course.end_date
 json.is_public @course.is_public
 json.course_module_types @course.course_modules.where(hidden: 0).pluck(:module_type)
-json.course_module_names @course.course_modules.where(hidden: 0).pluck(:module_name)
+json.course_modules @course_modules do |module_type|
+  json.module_type module_type.module_type
+  json.hidden module_type.hidden
+  json.module_name module_type.module_name
+end
 json.authentication @course.authentication
 json.professional_certification @course.professional_certification
 json.subject_id @course.subject_id