lib/role_on.rb in darkhelmet-role_on-0.2.4 vs lib/role_on.rb in darkhelmet-role_on-0.2.5

@@ -31,11 +31,11 @@
     alias :has_roles? :has_role?
   end
 
   module RoleOnUserClassMethods
     def helper_for(role,name = role.to_s.pluralize)
-      named_scope(name, lambda { { :conditions => ['role_id = ?', Role[role].id], :joins => :roles } })
-      named_scope("non_#{name}", lambda { { :conditions => [ 'roles.id is ? or roles.id != ?', nil, Role[role].id ], :joins => :roles } })
+      named_scope(name, lambda { { :conditions => ['roles.id = ?', Role[role].id], :joins => :roles } })
+      named_scope("non_#{name}", lambda { { :conditions => [ 'roles.id is ? or roles.id != ?', nil, Role[role].id ], :include => :roles } })
     end
   end
 
   def self.included(klass)
     if User == klass