Don't merge note versions on deletion

2015-10-30 12:19:35 -04:00
parent 6bbc957cdb
commit 6fe1a69e8e
1 changed files with 1 additions and 1 deletions
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -200,7 +200,7 @@ class Note < ActiveRecord::Base

  def merge_version?
    prev = versions.last
-    prev && prev.updater_id == CurrentUser.user.id && prev.updated_at > 1.hour.ago
+    prev && prev.updater_id == CurrentUser.user.id && prev.updated_at > 1.hour.ago && !is_active_changed?
  end

  def revert_to(version)