Move the pending address from the node onto the draft

2 files changed, 7 insertions, 7 deletions

diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index c153c241..ae206578 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -96,20 +96,20 @@
       <div id="metadata">
         <div class="layout_row_label"><%= t(".slug") %></div>
         <div class="layout_row_content">
-          <%= f.text_field(
-                :staged_slug, :value => @node.staged_slug || @node.slug
+          <%= d.text_field(
+                :slug, :value => @page.slug || @node.slug
               )
             %>
         </div>
 
         <div class="layout_row_label"><%= t(".parent") %></div>
         <div class="layout_row_content">
-          <%= text_field_tag :move_to_search_term, @node.parent.title rescue "" %>
+          <%= text_field_tag :move_to_search_term, (Node.find_by(:id => @page.parent_node_id) || @node.parent)&.title %>
           <p class="field_hint"><%= t(".parent_hint") %></p>
           <div id="move_to_search_results" class="search_results"></div>
-          <%= f.hidden_field(
-                :staged_parent_id,
-                :value => @node.staged_parent_id || @node.parent_id
+          <%= d.hidden_field(
+                :parent_node_id,
+                :value => @page.parent_node_id || @node.parent_id
               )
            %>
         </div>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 105e37ea..3b2d28d9 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -105,7 +105,7 @@
           <% end %>
           <div class="info_item">
             <span class="info_label"><%= t(".restore_to") %></span>
-            <% suggestion = @node.suggested_restore_parent %>
+            <% suggestion = @node.draft&.parent_node || @node.suggested_restore_parent %>
             <%= form_tag restore_from_trash_node_path(@node), :method => :put, :class => "aligned_action_row" do %>
               <div class="restore_picker">
                 <%= text_field_tag :restore_search_term,