Skip to content

Commit eb96834

Browse files
committed
ActiveRecord and Mongoid adapters now acceps nil for role_name prarm in remove
1 parent 038f9b9 commit eb96834

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

lib/rolify/adapters/active_record/role_adapter.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ def add(relation, role)
5050
end
5151

5252
def remove(relation, role_name, resource = nil)
53-
cond = { :name => role_name }
53+
cond = {}
54+
cond[:name] = role_name unless role_name.blank?
5455
cond[:resource_type] = (resource.is_a?(Class) ? resource.to_s : resource.class.name) if resource
5556
cond[:resource_id] = resource.id if resource && !resource.is_a?(Class)
5657
roles = relation.roles.where(cond)

lib/rolify/adapters/mongoid/role_adapter.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ def remove(relation, role_name, resource = nil)
6666
#
6767
# role.destroy if role.send(user_class.to_s.tableize.to_sym).empty?
6868
#end
69-
cond = { :name => role_name }
69+
cond = {}
70+
cond[:name] = role_name unless role_name.blank?
7071
cond[:resource_type] = (resource.is_a?(Class) ? resource.to_s : resource.class.name) if resource
7172
cond[:resource_id] = resource.id if resource && !resource.is_a?(Class)
7273
roles = relation.roles.where(cond)

0 commit comments

Comments
 (0)