diff --git a/app/controllers/templates_dashboard_controller.rb b/app/controllers/templates_dashboard_controller.rb index 51922c48..69843d15 100644 --- a/app/controllers/templates_dashboard_controller.rb +++ b/app/controllers/templates_dashboard_controller.rb @@ -55,10 +55,8 @@ class TemplatesDashboardController < ApplicationController rel = Template.where( Template.arel_table[:id].in( - Arel::Nodes::Union.new( - rel.where(folder_id: current_account.default_template_folder.id).select(:id).arel, - shared_template_ids.arel - ) + rel.where(folder_id: current_account.default_template_folder.id).select(:id).arel + .union(shared_template_ids.arel) ) ) else diff --git a/lib/abilities/template_conditions.rb b/lib/abilities/template_conditions.rb index 32afd8a3..ac50f3aa 100644 --- a/lib/abilities/template_conditions.rb +++ b/lib/abilities/template_conditions.rb @@ -13,7 +13,7 @@ module Abilities TemplateSharing.where({ ability:, account_id: [user.account_id, TemplateSharing::ALL_ID] }.compact) .select(:template_id) - Template.where(Template.arel_table[:id].in(Arel::Nodes::Union.new(templates.select(:id).arel, shared_ids.arel))) + Template.where(Template.arel_table[:id].in(templates.select(:id).arel.union(shared_ids.arel))) end def entity(template, user:, ability: nil)