From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Sun, 31 Oct 2010 23:55:19 +0000 (+0000)
Subject: Merged r4245 from trunk.
X-Git-Tag: 1.0.3~33
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a63c92388f0e8774d9ed9afeb409a719c12e7e3b;p=redmine.git

Merged r4245 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4317 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 1115691a1..7ac482327 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -8,6 +8,8 @@ class CalendarsController < ApplicationController
   helper :projects
   helper :queries
   include QueriesHelper
+  helper :sort
+  include SortHelper
 
   def show
     if params[:year] and params[:year].to_i > 1900
diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb
index ad047c669..3fb9ad1f0 100644
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_test.rb
@@ -16,6 +16,16 @@ class CalendarsControllerTest < ActionController::TestCase
     assert_template 'calendar'
     assert_not_nil assigns(:calendar)
   end
+
+  context "GET :show" do
+    should "run custom queries" do
+      @query = Query.generate_default!
+      
+      get :show, :query_id => @query.id
+      assert_response :success
+    end
+    
+  end
   
   def test_week_number_calculation
     Setting.start_of_week = 7