annotate .svn/pristine/60/6018ab7ca1dab1860e52066a04a65b61791def5f.svn-base @ 1519:afce8026aaeb redmine-2.4-integration

Merge from branch "live"
author Chris Cannam
date Tue, 09 Sep 2014 09:34:53 +0100
parents e248c7af89ec
children
rev   line source
Chris@1494 1 # Redmine - project management software
Chris@1494 2 # Copyright (C) 2006-2014 Jean-Philippe Lang
Chris@1494 3 #
Chris@1494 4 # This program is free software; you can redistribute it and/or
Chris@1494 5 # modify it under the terms of the GNU General Public License
Chris@1494 6 # as published by the Free Software Foundation; either version 2
Chris@1494 7 # of the License, or (at your option) any later version.
Chris@1494 8 #
Chris@1494 9 # This program is distributed in the hope that it will be useful,
Chris@1494 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@1494 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Chris@1494 12 # GNU General Public License for more details.
Chris@1494 13 #
Chris@1494 14 # You should have received a copy of the GNU General Public License
Chris@1494 15 # along with this program; if not, write to the Free Software
Chris@1494 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Chris@1494 17
Chris@1494 18 class CalendarsController < ApplicationController
Chris@1494 19 menu_item :calendar
Chris@1494 20 before_filter :find_optional_project
Chris@1494 21
Chris@1494 22 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
Chris@1494 23
Chris@1494 24 helper :issues
Chris@1494 25 helper :projects
Chris@1494 26 helper :queries
Chris@1494 27 include QueriesHelper
Chris@1494 28 helper :sort
Chris@1494 29 include SortHelper
Chris@1494 30
Chris@1494 31 def show
Chris@1494 32 if params[:year] and params[:year].to_i > 1900
Chris@1494 33 @year = params[:year].to_i
Chris@1494 34 if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
Chris@1494 35 @month = params[:month].to_i
Chris@1494 36 end
Chris@1494 37 end
Chris@1494 38 @year ||= Date.today.year
Chris@1494 39 @month ||= Date.today.month
Chris@1494 40
Chris@1494 41 @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
Chris@1494 42 retrieve_query
Chris@1494 43 @query.group_by = nil
Chris@1494 44 if @query.valid?
Chris@1494 45 events = []
Chris@1494 46 events += @query.issues(:include => [:tracker, :assigned_to, :priority],
Chris@1494 47 :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
Chris@1494 48 )
Chris@1494 49 events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
Chris@1494 50
Chris@1494 51 @calendar.events = events
Chris@1494 52 end
Chris@1494 53
Chris@1494 54 render :action => 'show', :layout => false if request.xhr?
Chris@1494 55 end
Chris@1494 56 end