jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't merge note versions on deletion

Browse Source
This commit is contained in:
Toks
2015-10-30 12:19:35 -04:00
parent 6bbc957cdb
commit 6fe1a69e8e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/note.rb
View File

@@ -200,7 +200,7 @@ class Note < ActiveRecord::Base
def merge_version? def merge_version?
prev = versions.last 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 end
def revert_to(version) def revert_to(version)