annotate .svn/pristine/51/51be1ed9a6fd0f544bf7334bc87d5f8e3ed5bf74.svn-base @ 1524:82fac3dcf466 redmine-2.5-integration

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