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

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
eabf1ff3 · Eric Davis · 4acd990e · eabf1ff3 · eabf1ff3
Commit eabf1ff3 authored Oct 10, 2010 by Eric Davis
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

calendars_controller.rb app/controllers/calendars_controller.rb +2 -0

calendars_controller_test.rb test/functional/calendars_controller_test.rb +10 -0

No files found.
--- 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

--- 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