diff options
| author | Xinhui | 2017-03-29 15:14:57 +0200 |
|---|---|---|
| committer | Xinhui | 2017-03-29 15:14:57 +0200 |
| commit | eaf9d4cf03ebd4c6c3c01a488736c86542b6119b (patch) | |
| tree | cff57081b063ea47a6bf3bf4558a9970a79bdd96 | |
| parent | 89696a036f3702abc0ffa4d5360cac3a2083bcd8 (diff) | |
| download | chouette-core-eaf9d4cf03ebd4c6c3c01a488736c86542b6119b.tar.bz2 | |
Fix user permissions sync
Refs #2954
| -rw-r--r-- | app/models/user.rb | 5 | ||||
| -rw-r--r-- | spec/fixtures/users.json | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index d861eb9e2..b921cdef8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -39,8 +39,7 @@ 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] - - if extra[:permissions] && extra[:permissions].include?('BOIV:Edition Offre') + if extra[:permissions] && extra[:permissions].include?('boiv:edit-offer') self.permissions = @@edit_offer_permissions end end @@ -71,7 +70,7 @@ class User < ActiveRecord::Base user.organisation = Organisation.sync_update el['organization_code'], el['organization_name'], el['functional_scope'] user.synced_at = Time.now - if el['permissions'] && el['permissions'].include?('BOIV:Edition Offre') + if el['permissions'] && el['permissions'].include?('boiv:edit-offer') user.permissions = @@edit_offer_permissions end user.save diff --git a/spec/fixtures/users.json b/spec/fixtures/users.json index ec3d65db2..f4236a29e 100644 --- a/spec/fixtures/users.json +++ b/spec/fixtures/users.json @@ -12,7 +12,7 @@ "organization_name": "STIF", "organization_code": "STIF", "permissions": [ - "BOIV:Edition Offre" + "boiv:edit-offer" ] }, { "id": 2, @@ -28,7 +28,7 @@ "organization_name": "STIF", "organization_code": "STIF", "permissions": [ - "BOIV:Edition Offre" + "boiv:edit-offer" ] }, { "id": 3, @@ -44,7 +44,7 @@ "organization_name": "STIF", "organization_code": "STIF", "permissions": [ - "BOIV:Edition Offre" + "boiv:edit-offer" ] }, { "id": 4, @@ -138,7 +138,7 @@ "organization_name": "STIF", "organization_code": "STIF", "permissions": [ - "BOIV:Edition Offre" + "boiv:edit-offer" ] }, { "id": 10, |