1 files changed, 5 insertions, 1 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)