4 files changed, 39 insertions, 13 deletions

diff --git a/app/controllers/node_actions_controller.rb b/app/controllers/node_actions_controller.rb
index 6e46719..9b97b45 100644
--- a/app/controllers/node_actions_controller.rb
+++ b/app/controllers/node_actions_controller.rb
@@ -6,7 +6,11 @@ class NodeActionsController < ApplicationController
 
   def index
     @actions = NodeAction.order(:occurred_at => :desc, :id => :desc)
-    @actions = @actions.where(:node_id => params[:node_id]) if params[:node_id].present?
+    if params[:node_id].present?
+      @actions = @actions.joins(:action_participants)
+                         .where(:action_participants => { :subject_type => "Node",
+                                                          :subject_id   => params[:node_id] })
+    end
     @actions = @actions.where(:user_id => params[:user_id]) if params[:user_id].present?
     @actions = @actions.includes(:node, :user)
                        .paginate(:page => params[:page], :per_page => 50)
diff --git a/app/models/action_participant.rb b/app/models/action_participant.rb
new file mode 100644
index 0000000..f179a48
--- /dev/null
+++ b/app/models/action_participant.rb
@@ -0,0 +1,4 @@
+class ActionParticipant < ApplicationRecord
+  belongs_to :node_action
+  belongs_to :subject, :polymorphic => true
+end
diff --git a/app/models/node.rb b/app/models/node.rb
index a5a40d3..7a93e79 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -4,7 +4,14 @@ class Node < ApplicationRecord
 
   # Associations
   has_many    :pages, -> { order("revision ASC") }, :dependent => :destroy
+
+  # Entries where this node is the primary subject (fast-path column).
+  # For a *complete* history -- including subtree trash/destroy entries
+  # recorded at an ancestor -- use participated_actions instead.
   has_many    :node_actions, :dependent => :nullify
+  has_many    :action_participations, :class_name => "ActionParticipant", :as => :subject
+  has_many    :participated_actions, :through => :action_participations, :source => :node_action
+
   belongs_to  :head,  :class_name => "Page",  :foreign_key => :head_id, optional: true
   belongs_to  :draft, :class_name => "Page",  :foreign_key => :draft_id, optional: true
   # Autosave pages carry no node_id, so has_many :pages does not cover
@@ -312,14 +319,14 @@ class Node < ApplicationRecord
       was_published      = head_id.present?
       final_published_at = head&.published_at
 
-      demoted = 0
-      ([self] + descendants.to_a).each do |node|
-        next unless node.head_id
+      subtree = [self] + descendants.to_a
+      demoted_nodes = subtree.select do |node|
+        next false unless node.head_id
         former        = node.head
         node.head     = nil
         node.draft_id = former.id if node.draft_id.nil?
         node.save!
-        demoted += 1
+        true
       end
 
       self.reload
@@ -332,9 +339,10 @@ class Node < ApplicationRecord
       metadata = { :path => { "from" => path_before, "to" => unique_name } }
       metadata[:was_published]      = true if was_published
       metadata[:final_published_at] = final_published_at.iso8601 if final_published_at
-      metadata[:demoted_heads]      = demoted if demoted > 0
+      metadata[:demoted_heads]      = demoted_nodes.size if demoted_nodes.any?
 
-      NodeAction.record!(:node => self, :user => current_user, :action => "trash", **metadata)
+      NodeAction.record!(:participants => subtree, :user => current_user,
+                          :action => "trash", **metadata)
       self
     end
   end
@@ -382,7 +390,8 @@ class Node < ApplicationRecord
       metadata = { :path => unique_name }
       metadata[:destroyed_descendants] = doomed.size - 1 if doomed.size > 1
 
-      NodeAction.record!(:node => self, :user => current_user, :action => "destroy", **metadata)
+      NodeAction.record!(:participants => doomed, :user => current_user,
+                          :action => "destroy", **metadata)
       doomed.each(&:destroy!)
     end
   end
diff --git a/app/models/node_action.rb b/app/models/node_action.rb
index 63a99ae..8a3dd8b 100644
--- a/app/models/node_action.rb
+++ b/app/models/node_action.rb
@@ -3,6 +3,8 @@ class NodeAction < ApplicationRecord
   belongs_to :page, optional: true
   belongs_to :user, optional: true
 
+  has_many :action_participants, :dependent => :destroy
+
   validates :action, presence: true
   validates :occurred_at, presence: true
 
@@ -81,10 +83,15 @@ class NodeAction < ApplicationRecord
   # This log records; it does not undo. No IP, session, or user
   # agent, ever. Success only.
 
-  def self.record!(node:, action:, user: nil, page: nil, locale: nil,
-                    occurred_at: nil, inferred_from: nil, **extra)
+  def self.record!(node: nil, participants: [], action:, user: nil, page: nil,
+                    locale: nil, occurred_at: nil, inferred_from: nil, **extra)
+    participants = participants.presence || [node].compact
+    raise ArgumentError, "NodeAction.record! needs at least one participant" if participants.empty?
+
+    primary_node = node || (participants.first if participants.first.is_a?(Node))
+
     create!(
-      :node          => node,
+      :node          => primary_node,
       :page          => page,
       :user          => user,
       :action        => action,
@@ -94,10 +101,12 @@ class NodeAction < ApplicationRecord
       :metadata      => {
         "username"                 => user&.login,
         "human_readable_node_name" => Globalize.with_locale(I18n.default_locale) {
-                                        node&.head&.title || node&.draft&.title
+                                        primary_node&.head&.title || primary_node&.draft&.title
                                       },
       }.merge(extra.stringify_keys)
-    )
+    ).tap do |na|
+      participants.each { |subject| na.action_participants.create!(:subject => subject) }
+    end
   end
 
   # Computes the publish-entry diff between an outgoing head and the