diff --git a/app/models/course.rb b/app/models/course.rb index 682f73958..9100f8470 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -81,7 +81,7 @@ class Course < ApplicationRecord # 老版的members弃用 现用course_members has_many :members - validate_harmonious_of [:name, :subject] + validate :validate_sensitive_string scope :hidden, ->(is_hidden = true) { where(is_hidden: is_hidden) } scope :ended, ->(is_end = true) { where(is_end: is_end) } @@ -437,4 +437,8 @@ class Course < ApplicationRecord self.laboratory = Laboratory.current if laboratory_id.blank? end + + def validate_sensitive_string + raise("课堂名称包含敏感词汇,请重新输入") unless HarmoniousDictionary.clean?(name) + end end diff --git a/app/models/course_list.rb b/app/models/course_list.rb index 84f18f0ef..ab7404a9e 100644 --- a/app/models/course_list.rb +++ b/app/models/course_list.rb @@ -7,5 +7,9 @@ class CourseList < ApplicationRecord has_many :gtopic_banks belongs_to :user - validate_harmonious_of :name + validate :validate_sensitive_string + + def validate_sensitive_string + raise("课程名称包含敏感词汇,请重新输入") unless HarmoniousDictionary.clean?(name) + end end diff --git a/app/models/memo.rb b/app/models/memo.rb index 6b7da3548..d79081350 100644 --- a/app/models/memo.rb +++ b/app/models/memo.rb @@ -16,7 +16,6 @@ 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 [:subject, :content] validate :validate_sensitive_string scope :field_for_list, lambda{