diff options
| author | Robert | 2017-06-02 16:01:57 +0200 |
|---|---|---|
| committer | Robert | 2017-06-02 16:01:57 +0200 |
| commit | b4193e4a246684974ecc4c40a230a07d921c737f (patch) | |
| tree | 7bcf6abba3f6848bcc9f82b5a55cc14c78787db8 /app/controllers | |
| parent | 4e791b7c834c65ee968580e0e0281eb97a7c89eb (diff) | |
| download | chouette-core-b4193e4a246684974ecc4c40a230a07d921c737f.tar.bz2 | |
Merge branch 'master' of github.com:af83/stif-boiv
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/calendars_controller.rb | 4 |
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 |