Mercurial > hg > soundsoftware-site
comparison app/controllers/calendars_controller.rb @ 51:371eac10df0b live
* Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.
author | Chris Cannam |
---|---|
date | Wed, 24 Nov 2010 12:20:08 +0000 |
parents | 94944d00e43c |
children | cbce1fd3b1b7 |
comparison
equal
deleted
inserted
replaced
34:09b1d4349da3 | 51:371eac10df0b |
---|---|
6 | 6 |
7 helper :issues | 7 helper :issues |
8 helper :projects | 8 helper :projects |
9 helper :queries | 9 helper :queries |
10 include QueriesHelper | 10 include QueriesHelper |
11 helper :sort | |
12 include SortHelper | |
11 | 13 |
12 def show | 14 def show |
13 if params[:year] and params[:year].to_i > 1900 | 15 if params[:year] and params[:year].to_i > 1900 |
14 @year = params[:year].to_i | 16 @year = params[:year].to_i |
15 if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13 | 17 if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13 |