Use current_organisation as begin_of_association_chain in StoAreasController. Refs #5111

3 files changed, 15 insertions, 2 deletions

diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index b478d38fa..b24e90ba5 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -1,7 +1,7 @@
 class StopAreasController < ChouetteController
   include ApplicationHelper
   include Activatable
-  
+
   defaults :resource_class => Chouette::StopArea
 
   belongs_to :stop_area_referential
@@ -155,6 +155,10 @@ class StopAreasController < ChouetteController
     end
   end
 
+  def begin_of_association_chain
+    current_organisation
+  end
+
   private
 
   def sort_column
diff --git a/spec/controllers/stop_areas_controller_spec.rb b/spec/controllers/stop_areas_controller_spec.rb
index 2b5f8c3e2..23bca3c36 100644
--- a/spec/controllers/stop_areas_controller_spec.rb
+++ b/spec/controllers/stop_areas_controller_spec.rb
@@ -1,7 +1,7 @@
 RSpec.describe StopAreasController, :type => :controller do
   login_user
 
-  let(:stop_area_referential) { create :stop_area_referential }
+  let(:stop_area_referential) { create :stop_area_referential, member: @user.organisation }
   let(:stop_area) { create :stop_area, stop_area_referential: stop_area_referential }
 
   describe 'PUT deactivate' do
diff --git a/spec/factories/stop_area_referentials.rb b/spec/factories/stop_area_referentials.rb
index fcba996e4..bdac050b1 100644
--- a/spec/factories/stop_area_referentials.rb
+++ b/spec/factories/stop_area_referentials.rb
@@ -2,5 +2,14 @@ FactoryGirl.define do
   factory :stop_area_referential, :class => StopAreaReferential do
     sequence(:name) { |n| "StopArea Referential #{n}" }
     objectid_format 'stif_reflex'
+
+    transient do
+      member nil
+    end
+
+    after(:create) do |stop_area_referential, evaluator|
+      stop_area_referential.add_member evaluator.member if evaluator.member
+      stop_area_referential.save
+    end
   end
 end