Calendars#index display other organisation shared calendars

Refs #3654

1 files changed, 1 insertions, 3 deletions

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