diff options
| author | Robert | 2017-07-07 15:45:36 +0200 |
|---|---|---|
| committer | Robert | 2017-07-07 15:45:36 +0200 |
| commit | e4133cee19db0aef55318296b2746be5be4b5896 (patch) | |
| tree | ece0c701f4dfc969a39762b895353fbc0df24877 | |
| parent | b31b713f84cab31870aab48fa739883df8fbf0c3 (diff) | |
| download | chouette-core-e4133cee19db0aef55318296b2746be5be4b5896.tar.bz2 | |
Hotfix user_permission computation in journey_patterns and vehicle_journey controllers
| -rw-r--r-- | app/controllers/journey_patterns_collections_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 1 | ||||
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | config/environments/development.rb | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/journey_patterns_collections_controller.rb b/app/controllers/journey_patterns_collections_controller.rb index 837ac65e7..e8924b7ad 100644 --- a/app/controllers/journey_patterns_collections_controller.rb +++ b/app/controllers/journey_patterns_collections_controller.rb @@ -49,8 +49,9 @@ class JourneyPatternsCollectionsController < ChouetteController end def user_permissions + policy = policy(:journey_pattern) @perms = - %w{create destroy edit}.inject({}) do | permissions, action | + %w{create destroy update}.inject({}) do | permissions, action | permissions.merge( "journey_patterns.#{action}" => policy.authorizes_action?(action) ) end.to_json end diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index f7e2fcdc1..70cca15ed 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -159,6 +159,7 @@ class VehicleJourneysController < ChouetteController end def user_permissions + policy = policy(:vehicle_journey) @perms = %w{create destroy update}.inject({}) do | permissions, action | permissions.merge( "vehicle_journeys.#{action}" => policy.authorizes_action?(action) ) diff --git a/app/models/user.rb b/app/models/user.rb index 1d9e435d5..14ab478a8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -41,7 +41,7 @@ class User < ActiveRecord::Base routing_constraint_zones time_tables vehicle_journeys - ]) << 'boiv:edit-offer' + ]) mattr_reader :edit_offer_permissions diff --git a/config/environments/development.rb b/config/environments/development.rb index f59a34a23..59cb9eefa 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -62,7 +62,7 @@ Rails.application.configure do config.codifligne_api_url = "https://pprod.codifligne.stif.info/rest/v1/lc/getlist" # config.chouette_authentication_settings = { - # type: "database" + # type: "database" # } config.chouette_authentication_settings = { type: "cas", |