diff options
| author | Xinhui | 2017-03-29 14:08:09 +0200 | 
|---|---|---|
| committer | Xinhui | 2017-03-29 14:08:09 +0200 | 
| commit | 7acc5b4a08a681af3c7ad4ef61e4d228443c58a1 (patch) | |
| tree | 40b43962ee7b7207c09c15efd849a4991d54ffe6 | |
| parent | dd9bf6345654bd9b6926f370a304dd81f5ba3c69 (diff) | |
| download | chouette-core-7acc5b4a08a681af3c7ad4ef61e4d228443c58a1.tar.bz2 | |
Fix user permissions sync from stif-portal
Refs #2954
| -rw-r--r-- | app/models/user.rb | 10 | 
1 files changed, 8 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index bc2d5e8ea..d861eb9e2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -39,7 +39,10 @@ class User < ActiveRecord::Base      self.name         = extra[:full_name]      self.email        = extra[:email]      self.organisation = Organisation.sync_update extra[:organisation_code], extra[:organisation_name], extra[:functional_scope] -    self.permissions  = @@edit_offer_permissions if extra[:permissions] && extra[:permissions].find { |permission| permission == 'boiv:edit-offer' } + +    if extra[:permissions] && extra[:permissions].include?('BOIV:Edition Offre') +      self.permissions  = @@edit_offer_permissions +    end    end    def self.portail_api_request @@ -66,8 +69,11 @@ class User < ActiveRecord::Base        user.email        = el['email']        user.locked_at    = el['locked_at']        user.organisation = Organisation.sync_update el['organization_code'], el['organization_name'], el['functional_scope'] -      user.permissions  = @@edit_offer_permissions if el['permissions'] && el['permissions'].find { |permission| permission == 'boiv:edit-offer' }        user.synced_at    = Time.now + +      if el['permissions'] && el['permissions'].include?('BOIV:Edition Offre') +        user.permissions = @@edit_offer_permissions +      end        user.save        puts "✓ user #{user.username} has been updated" unless Rails.env.test?      end  | 
