Merge branch 'fix-3246' into master-albert

2017-07-29 15:00:35 -05:00
parent 4b635628cc 1000f8d2e2
commit 04e9b8ebff
1 changed files with 1 additions and 0 deletions
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -10,6 +10,7 @@ class WikiPage < ApplicationRecord
  belongs_to :updater, :class_name => "User"
  validates_uniqueness_of :title, :case_sensitive => false
  validates_presence_of :title
+  validates_presence_of :body, :unless => -> { is_deleted? || other_names.present? }
  validate :validate_rename
  validate :validate_locker_is_builder
  validate :validate_not_locked