Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Prefer Model.reflections over private Model#_reflections. #2927

Merged
merged 2 commits into from
Aug 2, 2024
Merged

refactor: Prefer Model.reflections over private Model#_reflections. #2927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9204df7
Prefer Model.reflections over private Model#_reflections.
simi Jul 1, 2024
df167a9
Move to reflect_on_association.
simi Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/avo/base_resource.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def order_actions
end

def get_record_associations(record)
record._reflections
record.class.reflections
end

def valid_association_name(record, association_name)
Expand Down Expand Up @@ -382,7 +382,7 @@ def hydrate_model_with_default_values

if field.type == "belongs_to"

reflection = @model._reflections[@params[:via_relation]]
reflection = @model.class.reflections[@params[:via_relation]]

if field.polymorphic_as.present? && field.types.map(&:to_s).include?(@params[:via_relation_class])
# set the value to the actual record
Expand Down
8 changes: 4 additions & 4 deletions lib/avo/fields/belongs_to_field.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ def target_resource

reflection_key = polymorphic_as || id

if @model._reflections[reflection_key.to_s].klass.present?
App.get_resource_by_model_name @model._reflections[reflection_key.to_s].klass.to_s
elsif @model._reflections[reflection_key.to_s].options[:class_name].present?
App.get_resource_by_model_name @model._reflections[reflection_key.to_s].options[:class_name]
if @model.class.reflect_on_association(reflection_key).klass.present?
App.get_resource_by_model_name @model.class.reflect_on_association(reflection_key).klass.to_s
elsif @model.class.reflect_on_association(reflection_key).options[:class_name].present?
App.get_resource_by_model_name @model.class.reflect_on_association(reflection_key).options[:class_name]
else
App.get_resource_by_name reflection_key.to_s
end
Expand Down
8 changes: 4 additions & 4 deletions lib/avo/fields/has_base_field.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ def field_label
end

def target_resource
if @model._reflections[id.to_s].klass.present?
Avo::App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
elsif @model._reflections[id.to_s].options[:class_name].present?
Avo::App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
if @model.class.reflect_on_association(id).klass.present?
Avo::App.get_resource_by_model_name @model.class.reflect_on_association(id).klass.to_s
elsif @model.class.reflect_on_association(id).options[:class_name].present?
Avo::App.get_resource_by_model_name @model.class.reflect_on_association(id).options[:class_name]
else
Avo::App.get_resource_by_name id.to_s
end
Expand Down
Loading