comparison app/controllers/calendars_controller.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)
author Chris Cannam
date Fri, 24 Feb 2012 19:09:32 +0000
parents cbce1fd3b1b7
children 433d4f72a19b
comparison
equal deleted inserted replaced
908:c6c2cbd0afee 909:cbb26bc654de
3 # 3 #
4 # This program is free software; you can redistribute it and/or 4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License 5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2 6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version. 7 # of the License, or (at your option) any later version.
8 # 8 #
9 # This program is distributed in the hope that it will be useful, 9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details. 12 # GNU General Public License for more details.
13 # 13 #
14 # You should have received a copy of the GNU General Public License 14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software 15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 class CalendarsController < ApplicationController 18 class CalendarsController < ApplicationController
31 def show 31 def show
32 if params[:year] and params[:year].to_i > 1900 32 if params[:year] and params[:year].to_i > 1900
33 @year = params[:year].to_i 33 @year = params[:year].to_i
34 if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13 34 if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
35 @month = params[:month].to_i 35 @month = params[:month].to_i
36 end 36 end
37 end 37 end
38 @year ||= Date.today.year 38 @year ||= Date.today.year
39 @month ||= Date.today.month 39 @month ||= Date.today.month
40 40
41 @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month) 41 @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
42 retrieve_query 42 retrieve_query
43 @query.group_by = nil 43 @query.group_by = nil
44 if @query.valid? 44 if @query.valid?
45 events = [] 45 events = []
46 events += @query.issues(:include => [:tracker, :assigned_to, :priority], 46 events += @query.issues(:include => [:tracker, :assigned_to, :priority],
47 :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt] 47 :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
48 ) 48 )
49 events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt]) 49 events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
50 50
51 @calendar.events = events 51 @calendar.events = events
52 end 52 end
53 53
54 render :action => 'show', :layout => false if request.xhr? 54 render :action => 'show', :layout => false if request.xhr?
55 end 55 end
56 end 56 end