From 1cfe0589c98c7a99c2e926b9db53ca5f52629f94 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sun, 27 Apr 2025 08:13:51 +0000 Subject: [PATCH] Merged r23712 from trunk to 6.0-stable (#42622). git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23720 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 4ce63f809..c544ca64c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -89,8 +89,8 @@ class User < Principal :after_remove => Proc.new {|user, group| group.user_removed(user)} has_many :changesets, :dependent => :nullify has_one :preference, :dependent => :destroy, :class_name => 'UserPreference' - has_one :atom_token, lambda {where "action='feeds'"}, :class_name => 'Token' - has_one :api_token, lambda {where "action='api'"}, :class_name => 'Token' + has_one :atom_token, lambda {where "#{table.name}.action='feeds'"}, :class_name => 'Token' + has_one :api_token, lambda {where "#{table.name}.action='api'"}, :class_name => 'Token' has_one :email_address, lambda {where :is_default => true}, :autosave => true has_many :email_addresses, :dependent => :delete_all belongs_to :auth_source