Merge pull request #24 from ninech/fix-abscence-overview-crash

Fix crash of abscence overview without a year set
ninech · Jun 26, 2014 · 070e3a1 · 070e3a1
2 parents 91c09bd + 1938d9d
commit 070e3a1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/app/controllers/reports/absence_controller.rb b/app/controllers/reports/absence_controller.rb
@@ -18,6 +18,7 @@ def show
   end
 
   def calendar
+    @year ||= Time.now.year
     if @month.nil?
       @range = UberZeit.year_as_range(@year)
     else

diff --git a/spec/controllers/reports/absence_controller_spec.rb b/spec/controllers/reports/absence_controller_spec.rb
@@ -67,6 +67,13 @@
           get :calendar, team_id: nil, month: nil, year: 2013
           assigns(:range).should eq(UberZeit.year_as_range(2013))
         end
+
+        context 'without a year set' do
+          it 'assigns the current year as range' do
+            get :calendar, team_id: nil
+            assigns(:range).should eq(UberZeit.year_as_range(Time.now.year))
+          end
+        end
       end
 
       describe 'special rights' do