0
@@ -1,5 +1,7 @@
0
 * SVN *
0
 
0
+* Fix Site#tags query to return distinct tags [DeLynn Berry]
0
+
0
 * Simplify and properly test admin/article permissions for non-admins.
0
 
0
 * Change child_section and descendent_section methods in the SiteDrop to search the preloaded sections array.

0
@@ -93,8 +93,11 @@ class Site < ActiveRecord::Base
0
   end
0
 
0
   def tags
0
-    Tag.find(:all, :conditions => ['contents.type = ? AND contents.site_id = ?', 'Article', id], :order => 'tags.name',
0
-      :joins => "INNER JOIN taggings ON taggings.tag_id = tags.id INNER JOIN contents ON (taggings.taggable_id = contents.id AND taggings.taggable_type = 'Content')")
0
+    Tag.find(:all, :select      => "DISTINCT tags.name",
0
+                   :joins       => "INNER JOIN taggings ON taggings.tag_id = tags.id INNER JOIN contents ON (taggings.taggable_id = contents.id AND 
0
+                                    taggings.taggable_type = 'Content')",
0
+                   :conditions  => ['contents.type = ? AND contents.site_id = ?', 'Article', id],
0
+                   :order       => 'tags.name')
0
   end
0
 
0
   def theme_path

0
@@ -7,4 +7,19 @@ rails_another:
0
   id: 2
0
   tag_id: 2
0
   taggable_id: 2
0
+  taggable_type: Content
0
+rails_future:
0
+  id: 3
0
+  tag_id: 2
0
+  taggable_id: 5
0
+  taggable_type: Content
0
+mongrel_future:
0
+  id: 4
0
+  tag_id: 3
0
+  taggable_id: 5
0
+  taggable_type: Content
0
+ruby_future:
0
+  id: 5
0
+  tag_id: 1
0
+  taggable_id: 5
0
   taggable_type: Content
0
\ No newline at end of file

0
@@ -74,6 +74,6 @@ context "Article Tagging" do
0
   end
0
 
0
   specify "should find by tags in site" do
0
-    assert_models_equal [tags(:rails)], sites(:first).tags
0
+    assert_models_equal [tags(:mongrel), tags(:rails), tags(:ruby)], sites(:first).tags
0
   end
0
 end