diff options
Diffstat (limited to 'app/models/namespaces/traversal/recursive.rb')
| -rw-r--r-- | app/models/namespaces/traversal/recursive.rb | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/app/models/namespaces/traversal/recursive.rb b/app/models/namespaces/traversal/recursive.rb index 5a1a9d24117..d9e8743aa50 100644 --- a/app/models/namespaces/traversal/recursive.rb +++ b/app/models/namespaces/traversal/recursive.rb @@ -10,7 +10,7 @@ module Namespaces if persisted? strong_memoize(:root_ancestor) do - self_and_ancestors.reorder(nil).find_by(parent_id: nil) + recursive_self_and_ancestors.reorder(nil).find_by(parent_id: nil) end else parent.root_ancestor @@ -26,14 +26,19 @@ module Namespaces alias_method :recursive_self_and_hierarchy, :self_and_hierarchy # Returns all the ancestors of the current namespaces. - def ancestors + def ancestors(hierarchy_order: nil) return self.class.none unless parent_id object_hierarchy(self.class.where(id: parent_id)) - .base_and_ancestors + .base_and_ancestors(hierarchy_order: hierarchy_order) end alias_method :recursive_ancestors, :ancestors + def ancestor_ids(hierarchy_order: nil) + recursive_ancestors(hierarchy_order: hierarchy_order).pluck(:id) + end + alias_method :recursive_ancestor_ids, :ancestor_ids + # returns all ancestors upto but excluding the given namespace # when no namespace is given, all ancestors upto the top are returned def ancestors_upto(top = nil, hierarchy_order: nil) @@ -49,6 +54,11 @@ module Namespaces end alias_method :recursive_self_and_ancestors, :self_and_ancestors + def self_and_ancestor_ids(hierarchy_order: nil) + recursive_self_and_ancestors(hierarchy_order: hierarchy_order).pluck(:id) + end + alias_method :recursive_self_and_ancestor_ids, :self_and_ancestor_ids + # Returns all the descendants of the current namespace. def descendants object_hierarchy(self.class.where(parent_id: id)) @@ -63,12 +73,12 @@ module Namespaces alias_method :recursive_self_and_descendants, :self_and_descendants def self_and_descendant_ids - self_and_descendants.select(:id) + recursive_self_and_descendants.select(:id) end alias_method :recursive_self_and_descendant_ids, :self_and_descendant_ids def object_hierarchy(ancestors_base) - Gitlab::ObjectHierarchy.new(ancestors_base, options: { use_distinct: Feature.enabled?(:use_distinct_in_object_hierarchy, self) }) + Gitlab::ObjectHierarchy.new(ancestors_base) end end end |