TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removes parent_issue_id from scoped nested_set as it is no longer necessary - yeah

Browse Source
pull/291/head
Jens Ulferts 11 years ago
parent 231972eedf
commit 37ff41081f
2 changed files with 31 additions and 46 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 49
      lib/open_project/nested_set/with_root_id_scope.rb
  2. 28
      spec/models/work_package_nested_set_spec.rb

49
lib/open_project/nested_set/with_root_id_scope.rb
Unescape View File

@ -15,7 +15,6 @@ module OpenProject::NestedSet
def self.included(base)
base.class_eval do
skip_callback :create, :before, :set_default_left_and_right
before_save :set_parent_id_to_parent_issue_id
after_save :manage_root_id
acts_as_nested_set :scope => 'root_id', :dependent => :destroy
@ -48,40 +47,32 @@ module OpenProject::NestedSet
def validate_correct_parent
# Checks parent issue assignment
if @parent_issue
if !Setting.cross_project_issue_relations? && @parent_issue.project_id != self.project_id
errors.add :parent_issue_id, :not_a_valid_parent
if parent
if !Setting.cross_project_issue_relations? && parent.project_id != self.project_id
errors.add :parent_id, :not_a_valid_parent
elsif !new_record?
# moving an existing issue
if @parent_issue.root_id != root_id
if parent.root_id != root_id
# we can always move to another tree
elsif move_possible?(@parent_issue)
elsif move_possible?(parent)
# move accepted inside tree
else
errors.add :parent_issue_id, :not_a_valid_parent
errors.add :parent_id, :not_a_valid_parent
end
end
end
end
def parent_issue_id=(arg)
parent_issue_id = arg.blank? ? nil : arg.to_i
if parent_issue_id && @parent_issue = self.class.find_by_id(parent_issue_id)
journal_changes["parent_id"] = [self.parent_id, @parent_issue.id]
@parent_issue.id
else
@parent_issue = nil
journal_changes["parent_id"] = [self.parent_id, nil]
nil
end
warn "[DEPRECATION] No longer use parent_issue_id= - Use parent_id= instead."
self.parent_id = arg
end
def parent_issue_id
if instance_variable_defined? :@parent_issue
@parent_issue.nil? ? nil : @parent_issue.id
else
parent_id
end
warn "[DEPRECATION] No longer use parent_issue_id - Use parent_id instead."
parent_id
end
private
@ -92,13 +83,11 @@ module OpenProject::NestedSet
elsif parent_id_changed?
update_root_id
end
remove_instance_variable(:@parent_issue) if instance_variable_defined?(:@parent_issue)
end
def initial_root_id
if @parent_issue
self.root_id = @parent_issue.root_id
if parent_id
self.root_id = parent.root_id
else
self.root_id = id
end
@ -108,7 +97,9 @@ module OpenProject::NestedSet
end
def update_root_id
if !@parent_issue || @parent_issue.root_id != root_id
new_root_id = parent_id.nil? ? id : parent.root_id
if new_root_id != root_id
# as the following actions depend on the
# node having current values, we reload them here
self.reload_nested_set
@ -118,7 +109,6 @@ module OpenProject::NestedSet
old_root_id = root_id
old_rgt = rgt
new_root_id = @parent_issue.nil? ? id : @parent_issue.root_id
moved_span = nested_set_span + 1
move_subtree_to_new_set(new_root_id, old_root_id)
@ -175,11 +165,6 @@ module OpenProject::NestedSet
"ELSE #{quoted_left_column_name} END",
["root_id = ? AND #{quoted_right_column_name} > ?", old_root_id, rgt_offset])
end
def set_parent_id_to_parent_issue_id
self.parent_id = parent_issue_id
end
end
end
end

28
spec/models/work_package_nested_set_spec.rb
Unescape View File

@ -70,7 +70,7 @@ describe WorkPackage do
before do
parent.save!
instance.parent_issue_id = parent.id
instance.parent = parent
instance.save!
end
@ -83,7 +83,7 @@ describe WorkPackage do
before do
parent.save!
instance.save!
instance.parent_issue_id = parent.id
instance.parent = parent
instance.save!
end
@ -94,9 +94,9 @@ describe WorkPackage do
before do
parent.save!
instance.parent_issue_id = parent.id
instance.parent = parent
instance.save!
instance.parent_issue_id = nil
instance.parent_id = nil
instance.save!
end
@ -112,10 +112,10 @@ describe WorkPackage do
before do
parent.save!
parent2.save!
instance.parent_issue_id = parent2.id
instance.parent_id = parent2.id
instance.save!
instance.parent_issue_id = parent.id
instance.parent = parent
instance.save!
end
@ -133,12 +133,12 @@ describe WorkPackage do
before do
parent.save!
instance.parent_issue_id = parent.id
instance.parent = parent
instance.save!
other_child.parent_issue_id = parent.id
other_child.parent = parent
other_child.save!
instance.parent_issue_id = nil
instance.parent_id = nil
instance.save!
end
@ -178,10 +178,10 @@ describe WorkPackage do
before do
parent.save!
parent2.save!
instance.parent_issue_id = parent2.id
instance.parent_id = parent2.id
instance.save!
instance.parent_issue_id = parent.id
instance.parent = parent
instance.save!
end
@ -193,15 +193,15 @@ describe WorkPackage do
before do
parent.save!
instance.parent_issue_id = parent.id
instance.parent = parent
instance.save!
child.parent_issue_id = instance.id
child.parent_id = instance.id
child.save!
# reloading as instance's nested set attributes (lft, rgt) where
# updated by adding child to the set
instance.reload
instance.parent_issue_id = nil
instance.parent_id = nil
instance.save!
end

Write Preview
Loading…
Cancel
Save