diff --git a/app/grids/transactions_query.rb b/app/grids/transactions_query.rb index 99ea471..36d2990 100644 --- a/app/grids/transactions_query.rb +++ b/app/grids/transactions_query.rb @@ -8,7 +8,7 @@ class TransactionsQuery def arel Arel::SelectManager.new(ActiveRecord::Base) - .from(issued_by(User).union(issued_by(Client))) + .from(issued_by(User).union(:all, issued_by(Client))) .project(Arel.star) end @@ -30,7 +30,7 @@ class TransactionsQuery def transactions Arel::Nodes::TableAlias.new( - incoming.union(outgoing), + incoming.union(:all, outgoing), @perspectived.name ) end