diff options
| -rw-r--r-- | test/unit/issue_test.rb | 4 | ||||
| -rw-r--r-- | vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index 104933089..ff98711a3 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -164,6 +164,10 @@ class IssueTest < ActiveSupport::TestCase assert_equal [], projects.select {|p| !p.is_or_is_descendant_of?(project)} 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 field = IssueCustomField.find_by_name('Database') diff --git a/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb b/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb index b1e5ae1e7..f46fb4335 100644 --- a/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb +++ b/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb @@ -425,7 +425,7 @@ module CollectiveIdea #:nodoc: # the base ActiveRecord class, using the :scope declared in the acts_as_nested_set # declaration. 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]) options[:conditions] = scopes.inject({}) do |conditions,attr| conditions.merge attr => self[attr] |