Convert the log's node zoom to participants, completing subtree histories

2 files changed, 12 insertions, 1 deletions

diff --git a/app/controllers/node_actions_controller.rb b/app/controllers/node_actions_controller.rb
index 6e467197..9b97b450 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/node.rb b/app/models/node.rb
index e92fa1ea..7a93e799 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