kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: ambiguous lft column SQL error on Issue#descendants with a join on projects. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5441 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-04-12 16:31:00 +00:00
parent f0d32f6567
commit 949b355ef2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/issue_test.rb
View File

@ -164,6 +164,10 @@ class IssueTest < ActiveSupport::TestCase
assert_equal [], projects.select {|p| !p.is_or_is_descendant_of?(project)} assert_equal [], projects.select {|p| !p.is_or_is_descendant_of?(project)}
end end
def test_visible_and_nested_set_scopes
assert_equal 0, Issue.find(1).descendants.visible.all.size
end
def test_errors_full_messages_should_include_custom_fields_errors def test_errors_full_messages_should_include_custom_fields_errors
field = IssueCustomField.find_by_name('Database') field = IssueCustomField.find_by_name('Database')

2
vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb vendored
View File

@ -425,7 +425,7 @@ module CollectiveIdea #:nodoc:
# the base ActiveRecord class, using the :scope declared in the acts_as_nested_set # the base ActiveRecord class, using the :scope declared in the acts_as_nested_set
# declaration. # declaration.
def nested_set_scope def nested_set_scope
options = {:order => quoted_left_column_name} options = {:order => "#{self.class.table_name}.#{quoted_left_column_name}"}
scopes = Array(acts_as_nested_set_options[:scope]) scopes = Array(acts_as_nested_set_options[:scope])
options[:conditions] = scopes.inject({}) do |conditions,attr| options[:conditions] = scopes.inject({}) do |conditions,attr|
conditions.merge attr => self[attr] conditions.merge attr => self[attr]