diff options
| author | Luc Donnet | 2018-03-30 08:22:13 +0200 |
|---|---|---|
| committer | GitHub | 2018-03-30 08:22:13 +0200 |
| commit | afbe88e752f3c5e7eadfcf1ab53c740b60334779 (patch) | |
| tree | 570e5d639715c810d2342efe0ec08ce9b936f933 /app | |
| parent | bfb5d47aa682bd67f70509d18d3e76ab96c013c5 (diff) | |
| parent | 1b42ed84a5ac4394b1d135127c98194d073f025c (diff) | |
| download | chouette-core-afbe88e752f3c5e7eadfcf1ab53c740b60334779.tar.bz2 | |
Merge pull request #397 from af83/6258-calendar-workgroup
Refs #6258 associate calendars with current organisation
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/calendars_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index 3d88e4910..adb3b4764 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_association_chain + current_organisation + end + def ransack_contains_date date =[] if params[:q] && !params[:q]['contains_date(1i)'].empty? |