mirror of
https://github.com/meineerde/redmine.git
synced 2026-01-09 17:11:32 +00:00
Moved Project#hierarchy to NestedSet::Traversing.
git-svn-id: http://svn.redmine.org/redmine/trunk@13843 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
daef6a8037
commit
ded15dfc80
@ -696,15 +696,6 @@ class Project < ActiveRecord::Base
|
||||
safe_attributes 'inherit_members',
|
||||
:if => lambda {|project, user| project.parent.nil? || project.parent.visible?(user)}
|
||||
|
||||
# Returns an array of projects that are in this project's hierarchy
|
||||
#
|
||||
# Example: parents, children, siblings
|
||||
def hierarchy
|
||||
parents = project.self_and_ancestors || []
|
||||
descendants = project.descendants || []
|
||||
project_hierarchy = parents | descendants # Set union
|
||||
end
|
||||
|
||||
# Returns an auto-generated project identifier based on the last identifier used
|
||||
def self.next_identifier
|
||||
p = Project.order('id DESC').first
|
||||
|
||||
@ -111,6 +111,14 @@ module Redmine
|
||||
def is_or_is_descendant_of?(other)
|
||||
other == self || is_descendant_of?(other)
|
||||
end
|
||||
|
||||
# Returns the ancestors, the element and its descendants
|
||||
def hierarchy
|
||||
nested_set_scope.where(
|
||||
"#{self.class.table_name}.lft >= :lft AND #{self.class.table_name}.rgt <= :rgt" +
|
||||
" OR #{self.class.table_name}.lft < :lft AND #{self.class.table_name}.rgt > :rgt",
|
||||
{:lft => lft, :rgt => rgt})
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user