From 9cca5b062cef7943ac19502b4ef8771229142c5e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 7 Jan 2020 09:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=8F=E6=84=9F=E8=AF=8D=E6=B1=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course.rb      | 2 ++
 app/models/course_list.rb | 2 ++
 app/models/discuss.rb     | 2 ++
 app/models/memo.rb        | 1 +
 4 files changed, 7 insertions(+)

diff --git a/app/models/course.rb b/app/models/course.rb
index 2f561bba7..682f73958 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -81,6 +81,8 @@ class Course < ApplicationRecord
   # 老版的members弃用  现用course_members
   has_many :members
 
+  validate_harmonious_of [:name, :subject]
+
   scope :hidden,      ->(is_hidden = true) { where(is_hidden: is_hidden) }
   scope :ended,       ->(is_end = true) { where(is_end: is_end) }
   scope :processing,  -> { where(is_end: false) }
diff --git a/app/models/course_list.rb b/app/models/course_list.rb
index cd622f20a..84f18f0ef 100644
--- a/app/models/course_list.rb
+++ b/app/models/course_list.rb
@@ -6,4 +6,6 @@ class CourseList < ApplicationRecord
   has_many :gtask_banks
   has_many :gtopic_banks
   belongs_to :user
+
+  validate_harmonious_of :name
 end
diff --git a/app/models/discuss.rb b/app/models/discuss.rb
index 4e6cd617c..b7238dcd1 100644
--- a/app/models/discuss.rb
+++ b/app/models/discuss.rb
@@ -11,6 +11,8 @@ class Discuss < ApplicationRecord
   belongs_to :dis, polymorphic: true
 
   belongs_to :challenge, optional: true
+  validate_harmonious_of :content
+
   after_create :send_tiding
 
   scope :children, -> (discuss_id){ where(parent_id: discuss_id).includes(:user).reorder(created_at: :asc) }
diff --git a/app/models/memo.rb b/app/models/memo.rb
index d09251358..1b2be5476 100644
--- a/app/models/memo.rb
+++ b/app/models/memo.rb
@@ -16,6 +16,7 @@ class Memo < ApplicationRecord
   has_many :children, foreign_key: :parent_id, class_name: 'Memo'
   has_many :attachments, as: :container, dependent: :destroy
   has_many :tidings, as: :container, dependent: :destroy
+  validate_harmonious_of [:content, :subject]
 
   scope :field_for_list, lambda{
     select([:id, :subject, :author_id, :sticky, :updated_at, :language, :reward, :all_replies_count, :viewed_count, :forum_id])