Merge pull request #276 from sodabrew/group_by_alias

Group by name
sodabrew · Feb 20, 2014 · 4f0b81b · 4f0b81b
2 parents e07f946 + c7448ab
commit 4f0b81b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/models/node_class.rb b/app/models/node_class.rb
@@ -27,7 +27,7 @@ def self.per_page; SETTINGS.classes_per_page end # Pagination
       LEFT OUTER JOIN node_class_memberships ON (node_classes.id = node_class_memberships.node_class_id)
       LEFT OUTER JOIN nodes ON (nodes.id = node_class_memberships.node_id)
     SQL
-    :group => 'node_classes.id'
+    :group => 'node_classes.id, node_classes.name'
 
   def to_param
     SETTINGS.numeric_url_slugs ? id.to_s : name

diff --git a/app/models/node_group.rb b/app/models/node_group.rb
@@ -35,8 +35,11 @@ def self.per_page; SETTINGS.groups_per_page end # Pagination
 
   scope :with_nodes_count,
     :select => 'node_groups.*, count(nodes.id) as nodes_count',
-    :joins => 'LEFT OUTER JOIN node_group_memberships ON (node_groups.id = node_group_memberships.node_group_id) LEFT OUTER JOIN nodes ON (nodes.id = node_group_memberships.node_id)',
-    :group => 'node_groups.id'
+    :joins => <<-SQL,
+      LEFT OUTER JOIN node_group_memberships ON (node_groups.id = node_group_memberships.node_group_id)
+      LEFT OUTER JOIN nodes ON (nodes.id = node_group_memberships.node_id)
+    SQL
+    :group => 'node_groups.id, node_groups.name'
 
   assigns_related :node_class, :node_group, :node