lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Bug fixes for roles (#729)

Browse Source
This commit is contained in:
shawn-higgins1
2019-08-07 11:19:16 -04:00
committed by Jesus Federico
parent 6e73bbdb5a
commit 6d6ac3efdd
6 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/user.rb
View File

@ -248,7 +248,15 @@ class User < ApplicationRecord
unless has_role?(role)
role_provider = Rails.configuration.loadbalanced_configuration ? provider : "greenlight"
roles << Role.find_or_create_by(name: role, provider: role_provider)
new_role = Role.find_by(name: role, provider: role_provider)
if new_role.nil?
return if Role.duplicate_name(role, role_provider) || role.strip.empty?
new_role = Role.create_new_role(role, role_provider)
end
roles << new_role
save!
end