Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Revert "Rails 7 update" (#25667)

Browse source
This commit is contained in:
Eugen Rochko 2023-07-02 11:14:22 +02:00 • committed by GitHub
parent 5b46345459
commit ba06a2f104
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 144 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/serializers/initial_state_serializer.rb
View file

@ -83,10 +83,7 @@ class InitialStateSerializer < ActiveModel::Serializer
def accounts
store = {}
ActiveRecord::Associations::Preloader.new(
records: [object.current_account, object.admin, object.owner, object.disabled_account, object.moved_to_account].compact,
associations: [:account_stat, :user, { moved_to_account: [:account_stat, :user] }]
)
ActiveRecord::Associations::Preloader.new.preload([object.current_account, object.admin, object.owner, object.disabled_account, object.moved_to_account].compact, [:account_stat, :user, { moved_to_account: [:account_stat, :user] }])
store[object.current_account.id.to_s] = ActiveModelSerializers::SerializableResource.new(object.current_account, serializer: REST::AccountSerializer) if object.current_account
store[object.admin.id.to_s] = ActiveModelSerializers::SerializableResource.new(object.admin, serializer: REST::AccountSerializer) if object.admin