3 files changed, 56 insertions, 3 deletions

diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index f629985e..a40f3949 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -154,8 +154,7 @@
                 <div id="redirect_target_field" style="<%= "display: none;" unless @page.redirect.present? %>">
                   <div class="input_group" data-clears="page_redirect_node_id">
                     <span class="field_search_icon"><%= icon("search", library: "tabler", "aria-hidden": true) %></span>
-                    <%= text_field_tag :redirect_search_term,
-                          Node.find_by(:id => @page.redirect_node_id)&.title,
+                    <%= text_field_tag :redirect_search_term, @page.redirect_node&.title,
                           :placeholder => "—", :class => "clearable_input" %>
                     <div id="redirect_search_results" class="search_results"></div>
                     <button type="button" class="field_clear" aria-label="clear input">×</button>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 24ac4084..d8c08eb1 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -9,14 +9,35 @@
       <div class="info_group_items">
         <div class="info_item">
           <span class="info_label"><%= t(".head") %></span>
+          <% if @node.head&.redirect.present? %>
+            <span class="flag_stack">
+              <%= flag("arrow-ramp-right",
+                       redirect_flag_hint(@node.head),
+                       :tier => :attention) %>
+            </span>
+          <% end %>
           <%= @node.head ? t(".head_line", :title => @node.head.title, :rev => @node.head.revision, :time => @node.head.updated_at) : t(".never_published") %>
         </div>
         <div class="info_item">
           <span class="info_label"><%= t(".draft") %></span>
+          <% if @node.draft&.redirect.present? %>
+            <span class="flag_stack">
+              <%= flag("arrow-ramp-right",
+                       redirect_flag_hint(@node.draft),
+                       :tier => :attention) %>
+            </span>
+          <% end %>
           <%= @node.draft ? t(".draft_line", :title => @node.draft.title, :rev => @node.draft.revision, :time => @node.draft.updated_at) : t(".none") %>
         </div>
         <div class="info_item">
           <span class="info_label"><%= t(".autosave") %></span>
+          <% if @node.autosave&.redirect.present? %>
+            <span class="flag_stack">
+              <%= flag("arrow-ramp-right",
+                       redirect_flag_hint(@node.autosave),
+                       :tier => :attention) %>
+            </span>
+          <% end %>
           <%= @node.autosave ? t(".autosave_line", :title => @node.autosave.title, :time => @node.autosave.updated_at) : t(".none") %>
         </div>
       </div>
@@ -56,6 +77,11 @@
                   <% confirm += " " + t(".confirm_publish_moves",
                                         :path => @node.prospective_unique_name) %>
                 <% end %>
+                <% if @node.draft.redirect.present? && @node.head&.redirect.blank? %>
+                  <% confirm += " " + t(".confirm_publish_redirects") %>
+                <% elsif @node.draft.redirect.present? && @node.draft.redirect_differs_from?(@node.head) %>
+                  <% confirm += " " + t(".confirm_publish_redirect_changes") %>
+                <% end %>
                 <%= button_to t(".publish"), publish_node_path(@node), method: :put,
                       form: { data: { confirm: confirm }, class: 'button_to state_changing' } %>
               <% else %>
@@ -246,6 +272,17 @@
         </p>
       <% end %>
 
+      <% if (redirect = @node.head&.redirect_target) %>
+        <p class="pending_address">
+          <%= icon("arrow-right", library: "tabler", "aria-hidden": true) %>
+          <% if redirect.internal? %>
+            <%= t(".redirects_to", :path => redirect.node.unique_name) %>
+          <% else %>
+            <%= t(".redirects_to_url", :url => redirect.url) %>
+          <% end %>
+        </p>
+      <% end %>
+
       <div class="link_matrix link_matrix_<%= link_locales.size %>">
         <div class="link_matrix_head">
           <span></span>
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index 17146615..eb7955c2 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -74,7 +74,8 @@
                     @diff[:template_name][:changed] ||
                     @diff[:published_at][:changed] || @diff[:user][:changed] ||
                     @diff[:tags][:added].any?   || @diff[:tags][:removed].any? ||
-                    @diff[:assets][:added].any? || @diff[:assets][:removed].any? %>
+                    @diff[:assets][:added].any? || @diff[:assets][:removed].any? ||
+                    @diff[:redirect][:changed] || @diff[:redirect_node][:changed] %>
 
   <div class="diff_preamble">
     <div class="diff_meta">
@@ -98,6 +99,22 @@
         </p>
       <% end %>
 
+      <% if @diff[:redirect][:changed] %>
+        <h3><%= Page.human_attribute_name(:redirect) %></h3>
+        <p>
+          <del><%= @diff[:redirect][:from] ? t("nodes.edit.redirect_mode_#{@diff[:redirect][:from]}") : t(".none_marker") %></del>
+          <ins><%= @diff[:redirect][:to]   ? t("nodes.edit.redirect_mode_#{@diff[:redirect][:to]}")   : t(".none_marker") %></ins>
+        </p>
+      <% end %>
+
+      <% if @diff[:redirect_node][:changed] %>
+        <h3><%= Page.human_attribute_name(:redirect_node) %></h3>
+        <p>
+          <del><%= @diff[:redirect_node][:from]&.unique_name || t(".none_marker") %></del>
+          <ins><%= @diff[:redirect_node][:to]&.unique_name   || t(".none_marker") %></ins>
+        </p>
+      <% end %>
+
       <% if @diff[:published_at][:changed] %>
         <h3><%= Page.human_attribute_name(:published_at) %></h3>
         <p>