From 852e2931b3f23ca76ee689ea56755e662f9ef2bf Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 16 Aug 2019 18:27:22 +0800
Subject: [PATCH 1/5] =?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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 106ba3dd4..aaf24eadb 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1129,7 +1129,7 @@ class CoursesController < ApplicationController
 
   def validate_course_name
     tip_exception("课堂名称不能为空！") if params[:course][:name].blank?
-    if params[:subject_id].blank? || (@course && @course.subject.blank?)
+    if params[:subject_id].blank? && @course.blank? || (@course && @course.subject.blank?)
       tip_exception("课程名称不能为空！") if params[:course_list_name].blank?
       tip_exception("课堂名称应以课程名称开头命名") unless params[:course][:name].index(params[:course_list_name]) &&
         params[:course][:name].index(params[:course_list_name]) == 0

From 961fa1ade5c7175da8bfb9b951fe6de6f314d381 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 16 Aug 2019 18:28:42 +0800
Subject: [PATCH 2/5] =?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/models/homework_common.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 112fc523b..f198a7143 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -36,7 +36,7 @@ class HomeworkCommon < ApplicationRecord
 
   validates :name, length: { maximum: 60 }
   validates :description, length: { maximum: 15000 }
-  validates :reference_answer, length: { maximum: 5000 }
+  validates :reference_answer, length: { maximum: 15000 }
 
   # after_update :update_activity
   before_destroy :update_homework_bank_quotes

From 905f9c040e3f3035b8c368235a3b229919bd2664 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 16 Aug 2019 19:04:05 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachment_histories/_attachment_history.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/attachment_histories/_attachment_history.json.jbuilder b/app/views/attachment_histories/_attachment_history.json.jbuilder
index afb359e08..285aced42 100644
--- a/app/views/attachment_histories/_attachment_history.json.jbuilder
+++ b/app/views/attachment_histories/_attachment_history.json.jbuilder
@@ -8,3 +8,4 @@ json.downloads_count attachment.downloads_count
 json.created_on attachment.created_on
 json.url attachment_path(attachment, type: 'history').gsub("/api","")
 json.is_pdf attachment.is_history_pdf?
+json.attachment_id attachment.attachment_id

From efb1be8abe54174a317c10b38c0ee90e3bc7d605 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 16 Aug 2019 19:08:01 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachment_histories/_attachment_history.json.jbuilder      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/attachment_histories/_attachment_history.json.jbuilder b/app/views/attachment_histories/_attachment_history.json.jbuilder
index 285aced42..790bc9f2d 100644
--- a/app/views/attachment_histories/_attachment_history.json.jbuilder
+++ b/app/views/attachment_histories/_attachment_history.json.jbuilder
@@ -6,6 +6,6 @@ json.publish_time attachment.publish_time
 json.quotes attachment.quotes_count
 json.downloads_count attachment.downloads_count
 json.created_on attachment.created_on
-json.url attachment_path(attachment, type: 'history').gsub("/api","")
+json.url download_url(attachment.attachment)
 json.is_pdf attachment.is_history_pdf?
 json.attachment_id attachment.attachment_id

From b41d127635a981f2b2d9148584f0f60dfeba408a Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 16 Aug 2019 19:13:18 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachment_histories/_attachment_history.json.jbuilder      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/attachment_histories/_attachment_history.json.jbuilder b/app/views/attachment_histories/_attachment_history.json.jbuilder
index 790bc9f2d..285aced42 100644
--- a/app/views/attachment_histories/_attachment_history.json.jbuilder
+++ b/app/views/attachment_histories/_attachment_history.json.jbuilder
@@ -6,6 +6,6 @@ json.publish_time attachment.publish_time
 json.quotes attachment.quotes_count
 json.downloads_count attachment.downloads_count
 json.created_on attachment.created_on
-json.url download_url(attachment.attachment)
+json.url attachment_path(attachment, type: 'history').gsub("/api","")
 json.is_pdf attachment.is_history_pdf?
 json.attachment_id attachment.attachment_id