From 216ad28cfc022e20c57948c99a9ee276b102fcc7 Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Tue, 20 Mar 2018 21:05:57 -0700
Subject: Refs #6258 associate calendars with current organisation

---
 app/controllers/calendars_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app')

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index cc7570d65..2f25d95d6 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -104,6 +104,10 @@ class CalendarsController < ChouetteController
     end
   end
 
+   def begin_of_chain
+    current_organisation
+  end
+
   def ransack_contains_date
     date =[]
     if params[:q] && !params[:q]['contains_date(1i)'].empty?
-- 
cgit v1.2.3


From 1b42ed84a5ac4394b1d135127c98194d073f025c Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Thu, 29 Mar 2018 19:30:41 -0700
Subject: Refs #6258 Add speac feature for calendars and fix
 begin_of_association_chain in controller

---
 app/controllers/calendars_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 2f25d95d6..a6f31eead 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -104,7 +104,7 @@ class CalendarsController < ChouetteController
     end
   end
 
-   def begin_of_chain
+   def begin_of_association_chain
     current_organisation
   end
 
-- 
cgit v1.2.3