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 1115691a15896a10fa4a6fa930049d42efb0ed7b..7ac4823275e078e1bc8d9ec076fd12e291a5091f 100644 (file)
--- 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 ad047c6690e9879b9bb053fd72cb33037681fe19..3fb9ad1f0f07820799a28e5f09de2aa2508df72a 100644 (file)
--- 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