aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/calendars_controller.rb
diff options
context:
space:
mode:
authorTeddy Wing2017-06-19 18:20:59 +0200
committerTeddy Wing2017-06-19 18:20:59 +0200
commitb281113868ee80edb61de5b03adb761e4ceca036 (patch)
treea82a2bed39a293716c457357cb9ee5cb704195a3 /app/controllers/calendars_controller.rb
parent7172eaf839b57c1003537713286033e7e5f6c005 (diff)
downloadchouette-core-b281113868ee80edb61de5b03adb761e4ceca036.tar.bz2
CalendarsController#show: Wrap `@calendar` assignment in `#show!`
Don't really know what this is (assuming it comes from 'inherited_resources'), but putting the decoration inside this block seemed to work in the other cases I tried recently (like `LinesController#show`). Refs #3479
Diffstat (limited to 'app/controllers/calendars_controller.rb')
-rw-r--r--app/controllers/calendars_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 432e528f0..5662316b8 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -6,7 +6,9 @@ class CalendarsController < BreadcrumbController
respond_to :js, only: :index
def show
- @calendar = @calendar.decorate
+ show! do
+ @calendar = @calendar.decorate
+ end
end
private