Fix ambiguous order by 'name' column.

sodabrew · Mar 7, 2013 · 565002d · 565002d
1 parent d117ff2
commit 565002d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/node_class.rb b/app/models/node_class.rb
@@ -15,7 +15,7 @@ def self.per_page; SETTINGS.classes_per_page end # Pagination
   validates_format_of :name, :with => /\A([a-z0-9][-\w]*)(::[a-z0-9][-\w]*)*\Z/, :message => "must contain a valid Puppet class name, e.g. 'foo' or 'foo::bar'"
   validates_uniqueness_of :name
 
-  default_scope :order => 'name ASC'
+  default_scope :order => 'node_classes.name ASC'
 
   scope :search, lambda{|q| q.blank? ? {} : {:conditions => ['name LIKE ?', "%#{q}%"]} }
 

diff --git a/app/models/node_group.rb b/app/models/node_group.rb
@@ -25,7 +25,7 @@ def self.per_page; SETTINGS.groups_per_page end # Pagination
   validates_presence_of :name
   validates_uniqueness_of :name
 
-  default_scope :order => 'name ASC'
+  default_scope :order => 'node_groups.name ASC'
 
   scope :search, lambda{|q| q.blank? ? {} : {:conditions => ['name LIKE ?', "%#{q}%"]} }