From f1bf1440b4adea743cc9ca420f4bf08b3b3e8a11 Mon Sep 17 00:00:00 2001 From: BrokenEagle Date: Sun, 14 Jan 2018 20:10:44 -0800 Subject: [PATCH 1/2] Don't save wiki page when notes value is null --- app/models/artist.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/artist.rb b/app/models/artist.rb index 919059aeb..a0ae7afa0 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -382,7 +382,7 @@ class Artist < ApplicationRecord if @notes.present? create_wiki_page(body: @notes, title: name) end - elsif wiki_page.body != @notes || wiki_page.title != name + elsif (!@notes.nil? && (wiki_page.body != @notes)) || wiki_page.title != name # if anything changed, we need to update the wiki page wiki_page.body = @notes unless @notes.nil? wiki_page.title = name From 160829d262226c278abba90f9f9cc9d462c80541 Mon Sep 17 00:00:00 2001 From: BrokenEagle Date: Sun, 14 Jan 2018 20:11:41 -0800 Subject: [PATCH 2/2] Don't update the updater_id when nothing has changed --- app/models/wiki_page.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 5e9943b9a..ad8e2c90a 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -190,6 +190,10 @@ class WikiPage < ApplicationRecord title.tr("_", " ") end + def wiki_page_changed? + title_changed? || body_changed? || is_locked_changed? || is_deleted_changed? || other_names_changed? + end + def merge_version prev = versions.last prev.update_attributes( @@ -219,7 +223,7 @@ class WikiPage < ApplicationRecord end def create_version - if title_changed? || body_changed? || is_locked_changed? || is_deleted_changed? || other_names_changed? + if wiki_page_changed? if merge_version? merge_version else @@ -235,9 +239,11 @@ class WikiPage < ApplicationRecord def initialize_creator self.creator_id = CurrentUser.user.id end - + def initialize_updater - self.updater_id = CurrentUser.user.id + if wiki_page_changed? + self.updater_id = CurrentUser.user.id + end end def post_set