Merge branch 'hotfix/0.0.7'

* hotfix/0.0.7: Update ChangeLog return an arel object from our roles method to enable chaining bump version
jasherai · Aug 16, 2012 · d715ffc · d715ffc
2 parents 34b4a96 + 16cf308
commit d715ffc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,2 +1,2 @@
-* 957bbc8 Include global Roles in returned roles scope
-* f453eb5 Include Global Roles in scoping results
+* 63fe863 return an arel object from our roles method to enable chaining
+* 79bbcc5 bump version
diff --git a/lib/scoped_roles/models/roles_through_join.rb b/lib/scoped_roles/models/roles_through_join.rb
@@ -81,7 +81,7 @@ def has_role?(role_name)
       # returns Array
       def roles
         roles = super
-        roles & scoped_role
+        roles.where(id: scoped_role)
       end
 
       #def grant_role

diff --git a/lib/scoped_roles/version.rb b/lib/scoped_roles/version.rb
@@ -1,3 +1,3 @@
 module ScopedRoles
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end