5 files changed, 64 insertions, 48 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 22606674..3009e25a 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -90,7 +90,6 @@ class NodesController < ApplicationController
   end
 
   def update
-    @node.update(node_update_params)
     @node.autosave!( page_params.merge(:tag_list => params[:tag_list]), current_user )
     @node.save_draft!(current_user)
 
@@ -123,7 +122,6 @@ class NodesController < ApplicationController
   end
 
   def autosave
-    @node.update(node_update_params)
     @node.autosave!( page_params.merge(:tag_list => params[:tag_list]), current_user )
     head :ok
   rescue LockedByAnotherUser => e
@@ -167,13 +165,13 @@ class NodesController < ApplicationController
   end
 
   def restore_from_trash
-    parent = Node.find(params[:parent_id])
-    @node.restore_from_trash!(parent, current_user)
+    if params[:parent_id].present? && @node.draft
+      @node.draft.update!(:parent_node_id => params[:parent_id])
+    end
+
+    @node.restore_from_trash!(current_user)
     flash[:notice] = t("flash.nodes.restored")
     redirect_to node_path(@node)
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = t("flash.nodes.restore_target_missing")
-    redirect_to node_path(@node)
   rescue ActiveRecord::RecordInvalid => e
     flash[:error] = e.record.errors.full_messages.to_sentence
     redirect_to node_path(@node)
@@ -281,12 +279,9 @@ class NodesController < ApplicationController
       params.fetch(:node, {}).permit(:slug, :parent_id)
     end
 
-    def node_update_params
-      params.fetch(:node, {}).permit(:staged_slug, :staged_parent_id)
-    end
-
     def page_params
-      params.fetch(:page, {}).permit(:title, :abstract, :body, :template_name, :published_at, :user_id)
+      params.fetch(:page, {}).permit(:title, :abstract, :body, :template_name,
+                                 :published_at, :user_id, :slug, :parent_node_id)
     end
 
     def find_node
diff --git a/app/models/node.rb b/app/models/node.rb
index 4b7c9772..5c28a786 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -128,6 +128,7 @@ class Node < ApplicationRecord
 
   def autosave! attributes, current_user
     ensure_autosave!(current_user)
+    attributes = attributes.except(:slug, "slug") if attributes[:slug].blank? && attributes["slug"].blank?
     self.autosave.assign_attributes(attributes)
     self.autosave.save!
     self.autosave
@@ -227,17 +228,9 @@ class Node < ApplicationRecord
     self.reload
   end
 
-  def staged_slug=(value)
-    if head.blank?
-      self.slug = value
-    else
-      super
-    end
-  end
-
   def publish_draft! current_user = nil
-    # Return nil if nothing to publish and no staged changes
-    return nil unless self.draft || staged_slug || staged_parent_id
+    # Return nil if nothing to publish
+    return nil unless self.draft
 
     guard_live_change!(current_user, :target_path => prospective_unique_name)
 
@@ -263,26 +256,28 @@ class Node < ApplicationRecord
                             **NodeAction.head_diff(outgoing_head, self.head))
       end
 
-      if staged_slug && (staged_slug != slug)
-        self.slug = staged_slug
-        self.staged_slug = nil
+      if self.head.slug.present? && self.head.slug != slug
+        self.slug = self.head.slug
       end
 
-      if staged_parent_id && (staged_parent_id != parent_id)
-        new_parent = Node.find(staged_parent_id)
+      if self.head.parent_node_id && self.head.parent_node_id != parent_id
+        new_parent = Node.find_by(:id => self.head.parent_node_id)
 
-        if new_parent == self || self.descendants.include?(new_parent)
+        unless new_parent
+          errors.add(:base, :move_target_missing)
+          raise ActiveRecord::RecordInvalid.new(self)
+        end
+
+        if new_parent == self || self.descendants.include?(new_parent) ||
+           new_parent.trash_node? || new_parent.in_trash?
           errors.add(:base, :move_under_self)
           raise ActiveRecord::RecordInvalid.new(self)
         end
 
-        self.staged_parent_id = nil
         self.save!
         self.move_to_child_of(new_parent)
       else
-        unless self.save
-          raise ActiveRecord::RecordInvalid.new(self)
-        end
+        raise ActiveRecord::RecordInvalid.new(self) unless self.save
       end
 
       self.reload
@@ -369,9 +364,12 @@ class Node < ApplicationRecord
   # subtree comes back exactly as it sits in the Trash: all drafts,
   # nothing published. Republication is a separate, witnessed act
   # per node.
-  def restore_from_trash! new_parent, current_user = nil
+  def restore_from_trash! current_user = nil
     return nil unless in_trash?
 
+    target = (draft || head)&.parent_node_id
+    new_parent = target ? Node.find_by(:id => target) : nil
+
     if new_parent.nil? || new_parent == self || descendants.include?(new_parent) ||
        new_parent.trash_node? || new_parent.in_trash?
       errors.add(:base, :restore_target_invalid)
@@ -593,11 +591,9 @@ class Node < ApplicationRecord
     root? || self.class.restricted_path?(unique_name)
   end
 
+  # Falls back to the live address when the draft records none.
   def prospective_unique_name
-    target_parent = staged_parent_id ? Node.find_by(:id => staged_parent_id) : parent
-    return nil unless target_parent
-
-    [target_parent.unique_name.presence, staged_slug.presence || slug].compact.join("/")
+    (draft || head)&.prospective_unique_name || unique_name
   end
 
   # Returns immutable node id for all new nodes so that the atom feed entry ids
@@ -702,7 +698,7 @@ class Node < ApplicationRecord
     # that draft and publishes it.
     def initialize_empty_page
       if self.pages.empty?
-        self.draft = self.pages.create!
+        self.draft = self.pages.create!(:slug => self.slug, :parent_node_id => self.parent_id)
         self.save
       end
     end
@@ -744,14 +740,11 @@ class Node < ApplicationRecord
     def reserved_slug_stays_reserved
       if parent&.root? && !trash_node_already_me?
         errors.add(:slug, :reserved_for_trash) if slug == CccConventions::TRASH_SLUG
-        errors.add(:staged_slug, :reserved_for_trash) if staged_slug == CccConventions::TRASH_SLUG
       end
 
       if persisted? && slug_was == CccConventions::TRASH_SLUG && Node.find(id).trash_node?
         errors.add(:slug, :trash_immutable) if slug_changed?
         errors.add(:parent_id, :trash_immutable) if parent_id_changed?
-        errors.add(:staged_slug, :trash_must_be_empty) if staged_slug.present?
-        errors.add(:staged_parent_id, :trash_must_be_empty) if staged_parent_id.present?
       end
     end
 
diff --git a/app/models/page.rb b/app/models/page.rb
index 8313b1d4..4635f1b4 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -20,9 +20,13 @@ class Page < ApplicationRecord
             :inclusion   => { :in => ->(_) { Page.custom_templates } },
             :allow_blank => true,
             :if          => :template_name_changed?
+  validates_format_of   :slug, :with => /\A[A-Za-z0-9][A-Za-z0-9_-]*\z/,
+                        :unless => -> { slug.blank? }
+  validate :page_slug_not_reserved
 
   # Associations
   belongs_to :node, optional: true
+  belongs_to :parent_node, :class_name => "Node", :optional => true
   belongs_to :user, optional: true
   belongs_to :editor, :class_name => "User", optional: true
   has_many   :related_assets, :dependent => :destroy
@@ -202,6 +206,8 @@ class Page < ApplicationRecord
     page.translations.reload
 
     # Clone untranslated attributes
+    self.slug             = page.slug
+    self.parent_node_id   = page.parent_node_id
     self.tag_list         = page.tag_list
     self.template_name  ||= page.template_name
     self.published_at     = page.published_at
@@ -292,6 +298,20 @@ class Page < ApplicationRecord
     published_at.nil? ? true : published_at < Time.now
   end
 
+  # The address this page will have once published.
+  def prospective_unique_name
+    return nil if parent_node_id.nil?
+
+    parent = Node.find_by(:id => parent_node_id)
+    return nil unless parent
+
+    [parent.unique_name.presence, slug].compact.join("/")
+  end
+
+  def parent_node_missing?
+    parent_node_id.present? && !Node.exists?(:id => parent_node_id)
+  end
+
   def effective_lang
     if translated_locales.empty?
       return 'de'
@@ -333,6 +353,14 @@ class Page < ApplicationRecord
     end
   end
 
+  def page_slug_not_reserved
+    return unless slug == CccConventions::TRASH_SLUG
+    return if node&.trash_node?
+    return unless parent_node_id && Node.find_by(:id => parent_node_id)&.root?
+
+    errors.add(:slug, :reserved_for_trash)
+  end
+
   # Installs (or re-installs) the trigger that keeps page_translations'
   # search_vector in sync. Idempotent, safe to call on every boot.
   # search_vector is populated by a raw Postgres trigger, not anything
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,