Improve AAU

Exelord · Nov 5, 2016 · f96096f · f96096f
1 parent e597450
commit f96096f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/monarchy/acts_as_user.rb b/lib/monarchy/acts_as_user.rb
@@ -64,8 +64,11 @@ def accessible_roles_for(resource, inheritnce)
       def resource_and_inheritance_roles(resource)
         hierarchy_ids = resource.hierarchy.ancestors.select(:id)
         Monarchy.role_class.where(id:
-                      Monarchy.role_class.joins(:members).where('monarchy_members.user_id': id)
-                      .where('monarchy_roles.inherited': 't', 'monarchy_members.hierarchy_id': hierarchy_ids)
+                      Monarchy.role_class.joins(:members).where(
+                        'monarchy_members.user_id': id,
+                        'monarchy_roles.inherited': 't',
+                        'monarchy_members.hierarchy_id': hierarchy_ids
+                      )
                       .select(:inherited_role_id))
                 .union(resource_roles(resource))
                 .distinct