From e4133cee19db0aef55318296b2746be5be4b5896 Mon Sep 17 00:00:00 2001
From: Robert
Date: Fri, 7 Jul 2017 15:45:36 +0200
Subject: Hotfix user_permission computation in journey_patterns and
 vehicle_journey controllers

---
 app/controllers/journey_patterns_collections_controller.rb | 3 ++-
 app/controllers/vehicle_journeys_controller.rb             | 1 +
 app/models/user.rb                                         | 2 +-
 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",
-- 
cgit v1.2.3