From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Sun, 10 Oct 2010 21:17:10 +0000 (+0000)
Subject: Add SortHelper so custom queries will run on the Calendar. #6612
X-Git-Tag: 1.1.0~290
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eabf1ff3e703609f4ec80d98a2f56a91674fdcbc;p=redmine.git

Add SortHelper so custom queries will run on the Calendar. #6612

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4245 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index febacd075..4544b3399 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