Skip to content

Commit

Permalink
Merge pull request #17897 from kbrock/relationships_cruft
Browse files Browse the repository at this point in the history
relationships: remove duplicate method calls
  • Loading branch information
bdunne committed Aug 27, 2018
2 parents 6c78ec8 + b05888a commit 7550098
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions app/models/mixins/relationship_mixin.rb
Expand Up @@ -127,7 +127,7 @@ def parent_rel_ids
def parent_rels(*args)
options = args.extract_options!
pri = parent_rel_ids
rels = pri.kind_of?(Array) && pri.empty? ? Relationship.none : Relationship.where(:id => parent_rel_ids)
rels = pri.kind_of?(Array) && pri.empty? ? Relationship.none : Relationship.where(:id => pri)
Relationship.filter_by_resource_type(rels, options)
end

Expand Down Expand Up @@ -504,7 +504,6 @@ def fulltree_rels_arranged(*args)
options = args.extract_options!
root_id = relationship.try(:root_id)
return {relationship_for_isolated_root => {}} if root_id.nil?
Relationship.subtree_of(root_id).arrange
Relationship.filter_by_resource_type(Relationship.subtree_of(root_id), options).arrange
end

Expand Down

0 comments on commit 7550098

Please sign in to comment.