aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2018-02-01 22:26:00 +0100
committerAlban Peignier2018-02-01 22:26:00 +0100
commit6b29758a5f183a6f88759a59b4441588b0af0239 (patch)
treeb3d7fd7383e7192da12036d5f394da99d3542ddd
parentc2bc391ee91cac70e726d188be97dd2323df0df2 (diff)
downloadchouette-core-6b29758a5f183a6f88759a59b4441588b0af0239.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 43ed0cfd9..5cc7912b7 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -15,6 +15,7 @@ class CalendarsController < ChouetteController
end
def show
+ @year = params[:year] ? params[:year].to_i : Date.today.cwyear
end
def month