aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2018-02-01 22:26:00 +0100
committercedricnjanga2018-02-06 11:11:32 -0800
commit941338da24b611074682fa6bccf712992abf9389 (patch)
tree2b3f04204dc3c08cbbd398a8b02fb1cd9c868131
parentce7ea85b3922d97b54d90f458eb59c269359e2b3 (diff)
downloadchouette-core-941338da24b611074682fa6bccf712992abf9389.tar.bz2
Define @year in CalendarsController as expected by view. Refs #5682
-rw-r--r--app/controllers/calendars_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 3b7b6de15..75d4cbd09 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -18,6 +18,7 @@ class CalendarsController < ChouetteController
def show
show! do
+ @year = params[:year] ? params[:year].to_i : Date.today.cwyear
@calendar = @calendar.decorate(context: {
workgroup: workgroup
})