From 638c80760fb47c4303c3ce7594084eb9afa96ce2 Mon Sep 17 00:00:00 2001 From: taitus Date: Tue, 26 Mar 2019 12:51:23 +0100 Subject: [PATCH] Fix queries and scopes after column deletion Some queries were accessing original column instead of the new translatable one. This should have been causing unexpected behavior for requests maded in a different locale than the application default. --- app/models/budget/group.rb | 2 +- app/models/user.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/budget/group.rb b/app/models/budget/group.rb index d316d2512..a95d7ea27 100644 --- a/app/models/budget/group.rb +++ b/app/models/budget/group.rb @@ -28,7 +28,7 @@ class Budget validates :budget_id, presence: true validates :slug, presence: true, format: /\A[a-z0-9\-_]+\z/ - scope :sort_by_name, -> { includes(:translations).order(:name) } + scope :sort_by_name, -> { joins(:translations).order(:name) } def single_heading_group? headings.count == 1 diff --git a/app/models/user.rb b/app/models/user.rb index 02157212e..c837fbc6b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -128,7 +128,7 @@ class User < ActiveRecord::Base end def headings_voted_within_group(group) - Budget::Heading.order("name").where(id: voted_investments.by_group(group).pluck(:heading_id)) + Budget::Heading.joins(:translations).order("name").where(id: voted_investments.by_group(group).pluck(:heading_id)) end def voted_investments