From 6ae4dc1f2d05f4499245e77680e69a0678c17bc7 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Fri, 2 Jun 2017 15:18:13 +0200
Subject: Calendars#index display other organisation shared calendars

Refs #3654
---
 app/controllers/calendars_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app/controllers/calendars_controller.rb')

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 5370d9cbb..86d567882 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -33,10 +33,8 @@ class CalendarsController < BreadcrumbController
 
   def collection
     return @calendars if @calendars
-    scope = Calendar.where('organisation_id = ?', current_organisation.id)
-
+    scope = Calendar.where('organisation_id = ? OR shared = ?', current_organisation.id, true)
     scope = shared_scope(scope)
-
     @q = scope.ransack(params[:q])
 
     calendars = @q.result
-- 
cgit v1.2.3