Fixes #17458 - include user group admins

app/models/concerns/taxonomix.rb

@@ -109,7 +109,7 @@ def inner_select(taxonomy, inner_method = which_ancestry_method)
     end
 
     def admin_ids
-      User.unscoped.where(:admin => true).pluck(:id) if self == User
+      User.unscoped.only_admin.pluck(:id) if self == User
     end
 
     def scope_by_taxable_ids(scope)

test/models/taxonomix_test.rb

@@ -260,4 +260,17 @@ def setup
       end
     end
   end
+
+  test "#admin_ids finds admins both assigned the permission directly and through user group" do
+    direct_admin = group_admin = nil
+    as_admin do
+      direct_admin = FactoryGirl.create(:user, :admin)
+      group = FactoryGirl.create(:usergroup, :admin => true)
+      group_admin = FactoryGirl.create(:user, :usergroups => [ group ])
+    end
+
+    found_admins = User.admin_ids
+    assert_includes found_admins, direct_admin.id
+    assert_includes found_admins, group_admin.id
+  end
 end