Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ActiveRecord and Mongoid adapters now acceps nil for role_name on remove #427

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ActiveRecord and Mongoid adapters now acceps nil for role_name on remove #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb96834
ActiveRecord and Mongoid adapters now acceps nil for role_name prarm …
Genkilabs Nov 23, 2016
1dd66ab
Merge branch 'master' into master
Genkilabs Mar 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/rolify/adapters/active_record/role_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ def add(relation, role)
end

def remove(relation, role_name, resource = nil)
cond = { :name => role_name }
cond = {}
cond[:name] = role_name unless role_name.blank?
cond[:resource_type] = (resource.is_a?(Class) ? resource.to_s : resource.class.name) if resource
cond[:resource_id] = resource.id if resource && !resource.is_a?(Class)
roles = relation.roles.where(cond)
Expand Down
3 changes: 2 additions & 1 deletion lib/rolify/adapters/mongoid/role_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ def remove(relation, role_name, resource = nil)
#
# role.destroy if role.send(user_class.to_s.tableize.to_sym).empty?
#end
cond = { :name => role_name }
cond = {}
cond[:name] = role_name unless role_name.blank?
cond[:resource_type] = (resource.is_a?(Class) ? resource.to_s : resource.class.name) if resource
cond[:resource_id] = resource.id if resource && !resource.is_a?(Class)
roles = relation.roles.where(cond)
Expand Down