From 157cfdd59061db70c8bfcf8cd3e75de1bc1ee69f Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 14 Aug 2019 15:56:31 +0800
Subject: [PATCH] =?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 |   4 ++--
 app/models/course.rb                  |   2 +-
 dump.rdb                              | Bin 1888 -> 1992 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index ce9c9af6c..106ba3dd4 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1129,12 +1129,12 @@ class CoursesController < ApplicationController
 
   def validate_course_name
     tip_exception("课堂名称不能为空！") if params[:course][:name].blank?
-    if params[:subject_id].blank? || @course.subject.blank?
+    if params[:subject_id].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
     else
-      @subject = @course ? @course.subject : Subject.find_by!(id: params[:subject_id])
+      @subject = @course.present? ? @course.subject : Subject.find_by!(id: params[:subject_id])
       tip_exception("开始时间不能为空") if params[:start_date].blank?
       tip_exception("结束时间不能为空") if params[:end_date].blank?
       tip_exception("结束时间必须晚于开始时间") if params[:end_date] <= params[:start_date]
diff --git a/app/models/course.rb b/app/models/course.rb
index 16cb7a8c6..b7bea6ec0 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -5,7 +5,7 @@ class Course < ApplicationRecord
 
   belongs_to :teacher, class_name: 'User', foreign_key: :tea_id  # 定义一个方法teacher，该方法通过tea_id来调用User表
   belongs_to :school, class_name: 'School', foreign_key: :school_id #定义一个方法school，该方法通过school_id来调用School表
-  belongs_to :course_list
+  belongs_to :course_list, optional: true
 
   # 所属实践课程
   belongs_to :subject, optional: true
diff --git a/dump.rdb b/dump.rdb
index c4edd44ed9369cb224d86d4db8d9b1e4349f94f5..d3784bb931ede1f45cc279e5c502909dc4ba43f4 100644
GIT binary patch
delta 436
zcmWN}J8Kj{902g$*?Z+YF9elf6mLBr2s-P`{O2j8P|j!}X;Nq-GOsIy1k?+p30PT}
zLS;XI_9q6hv9hqT^dlUDh#<BWktC-56~9^k+x%;?@b=5v!@bVtvl#GtT>tw0$;X=?
z^8V=b>e67TpJj`^ENj>M`O8bp5zx*94xT#9jj>oWZZL7ys-SdXB&hm5T5d2Py8eS6
z+&c-(djmE&2NWVB9)PGaFL%!Rr_oMgcw{HT8&pW4qyZ%=0KteUH?j@8H9IzF8N#;@
z4)e5&>KEwpo%4gViV6zEq<|K+;@(6`J#fjm48#ZJ8S`aIZPb&7QYI_OsOBPd(JVje
zwAel<Q2nY{8IIl@;T(~wQW_*z={R~mK%AP3O^34mpVLmgS6n|aPY9^7Q_)4@j0d&y
zyIyXbt46KtUz!#@su&GX1WZk|w~A)KmMMGX%p3&otz*o{bhoH?8lU;Xn2fRIN?<3w
x7uryMwYo6;b-UYI+jNhkpOp7A`Xe^loJPVK)7QG6wwklNvx^V^zB@G?{|DFsevkkF

delta 331
zcmV~$y-LGC007|pwbokeU!{xKSlco6?sB=y2@Y23AWpith$MHHq0kQ6f(Qj?1rhTG
zPK6esh~Vs^i{K-Kkk!peZT0)!=A!&9SZMYSj=wYAGbyZ=Y`uIujkX`u{LW~<SSsce
zrI1yWbU0S8!aKbh4z(=<+JJ?h+R<LorI<4bA-6F>m<YfH<p^=}dWD}#uOr2Y*C}s8
zhd6{mh)9hf=wiogD{b#Qnkl83>+~jnYB<q%tM!{Wt4#w!Yt*#~rtz$HS(?I-;od~o
z%9=7x2B|PGHVX3q*fj8|^d;~aw<$H_uy3q_x~}}h13d>Rf<ijNf=qgKeNk8*qMjwV
zEjaglgcw;flSVrHGM=5K00fqYsbl$sbH`;6Q_!d+4LyC>^_!A+)-M#8NF$4(1Q;P#
TBJdccA~myoKg?I&e_#Ir0<L9$