3 files changed, 20 insertions, 5 deletions

diff --git a/app/models/node.rb b/app/models/node.rb
index 52e06d2d..ef981a97 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -243,7 +243,7 @@ class Node < ApplicationRecord
       end
 
       if self.draft.redirect_node_id.present?
-        target = Node.find_by(:id => self.draft.redirect_node_id)
+        target = self.draft.redirect_node
 
         unless target
           errors.add(:base, :redirect_target_missing)
diff --git a/app/models/node_action.rb b/app/models/node_action.rb
index aab1d238..a7036833 100644
--- a/app/models/node_action.rb
+++ b/app/models/node_action.rb
@@ -200,6 +200,12 @@ class NodeAction < ApplicationRecord
     old_url, new_url = old_page.external_url, new_page.external_url
     diff[:external_url] = { "from" => old_url, "to" => new_url } if old_url != new_url
 
+    old_redirect, new_redirect = old_page.redirect, new_page.redirect
+    diff[:redirect] = { "from" => old_redirect, "to" => new_redirect } if old_redirect != new_redirect
+
+    old_target, new_target = old_page.redirect_node&.unique_name, new_page.redirect_node&.unique_name
+    diff[:redirect_target] = { "from" => old_target, "to" => new_target } if old_target != new_target
+
     old_tags, new_tags = old_page.tag_list.sort, new_page.tag_list.sort
     diff[:tags] = { "from" => old_tags, "to" => new_tags } if old_tags != new_tags
 
diff --git a/app/models/page.rb b/app/models/page.rb
index 5d3cb0aa..91b7e975 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -36,6 +36,7 @@ class Page < ApplicationRecord
   belongs_to :parent_node, :class_name => "Node", :optional => true
   belongs_to :user, optional: true
   belongs_to :editor, :class_name => "User", optional: true
+  belongs_to :redirect_node, :class_name => "Node", :optional => true
   has_many   :related_assets, :dependent => :destroy
   has_many   :assets, -> { order("position ASC") }, :through => :related_assets
 
@@ -289,7 +290,11 @@ class Page < ApplicationRecord
                        changed: user_id != other.user_id },
       tags:          { added: tag_list.to_a - other.tag_list.to_a, removed: other.tag_list.to_a - tag_list.to_a },
       template_name: { from: other.template_name, to: template_name, changed: template_name != other.template_name },
-      assets:        { added: assets.to_a - other.assets.to_a, removed: other.assets.to_a - assets.to_a }
+      assets:        { added: assets.to_a - other.assets.to_a, removed: other.assets.to_a - assets.to_a },
+      redirect:      { from: other.redirect, to: redirect,
+                       changed: redirect != other.redirect },
+      redirect_node: { from: other.redirect_node, to: redirect_node,
+                       changed: redirect_node_id != other.redirect_node_id }
     )
   end
 
@@ -326,9 +331,8 @@ class Page < ApplicationRecord
     return nil if redirect.blank?
 
     if redirect_node_id.present?
-      target = Node.find_by(:id => redirect_node_id)
-      return nil unless target&.head
-      return RedirectTarget.new(target, nil)
+      return nil unless redirect_node&.head
+      return RedirectTarget.new(redirect_node, nil)
     end
 
     return RedirectTarget.new(nil, external_url) if external_url.present?
@@ -345,6 +349,11 @@ class Page < ApplicationRecord
     Node.where(:head_id => where(:redirect_node_id => node_id).select(:id))
   end
 
+  def redirect_differs_from? other
+    mine, theirs = redirect_target, other&.redirect_target
+    mine&.url != theirs&.url || mine&.node != theirs&.node
+  end
+
   # The address this page will have once published.
   def prospective_unique_name
     return nil if parent_node_id.nil?