summaryrefslogtreecommitdiffstats
path: root/vendor
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-04-12 16:31:00 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-04-12 16:31:00 +0000
commit949b355ef213dcab4b88e15203503c658f01035e (patch)
tree1656957891ae9b41e159a1828180054d3e1e1105 /vendor
parentf0d32f65678e9be9e07c0928dd731c561290328c (diff)
downloadredmine-949b355ef213dcab4b88e15203503c658f01035e.tar.gz
redmine-949b355ef213dcab4b88e15203503c658f01035e.zip
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
Diffstat (limited to 'vendor')
-rw-r--r--vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb2
1 files changed, 1 insertions, 1 deletions
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]