annotate .svn/pristine/c7/c7dbabe98ae3e574a637d9bbb8d3b6e27e263f8a.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 ActivitiesController < ApplicationController
Chris@909 19 menu_item :activity
Chris@909 20 before_filter :find_optional_project
Chris@909 21 accept_rss_auth :index
Chris@909 22
Chris@909 23 def index
Chris@909 24 @days = Setting.activity_days_default.to_i
Chris@909 25
Chris@909 26 if params[:from]
Chris@909 27 begin; @date_to = params[:from].to_date + 1; rescue; end
Chris@909 28 end
Chris@909 29
Chris@909 30 @date_to ||= Date.today + 1
Chris@909 31 @date_from = @date_to - @days
Chris@909 32 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
Chris@909 33 @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
Chris@909 34
Chris@909 35 @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
Chris@909 36 :with_subprojects => @with_subprojects,
Chris@909 37 :author => @author)
Chris@909 38 @activity.scope_select {|t| !params["show_#{t}"].nil?}
Chris@909 39 @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
Chris@909 40
Chris@909 41 events = @activity.events(@date_from, @date_to)
Chris@909 42
Chris@909 43 if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, User.current, current_language])
Chris@909 44 respond_to do |format|
Chris@909 45 format.html {
Chris@909 46 @events_by_day = events.group_by(&:event_date)
Chris@909 47 render :layout => false if request.xhr?
Chris@909 48 }
Chris@909 49 format.atom {
Chris@909 50 title = l(:label_activity)
Chris@909 51 if @author
Chris@909 52 title = @author.name
Chris@909 53 elsif @activity.scope.size == 1
Chris@909 54 title = l("label_#{@activity.scope.first.singularize}_plural")
Chris@909 55 end
Chris@909 56 render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
Chris@909 57 }
Chris@909 58 end
Chris@909 59 end
Chris@909 60
Chris@909 61 rescue ActiveRecord::RecordNotFound
Chris@909 62 render_404
Chris@909 63 end
Chris@909 64
Chris@909 65 private
Chris@909 66
Chris@909 67 # TODO: refactor, duplicated in projects_controller
Chris@909 68 def find_optional_project
Chris@909 69 return true unless params[:id]
Chris@909 70 @project = Project.find(params[:id])
Chris@909 71 authorize
Chris@909 72 rescue ActiveRecord::RecordNotFound
Chris@909 73 render_404
Chris@909 74 end
Chris@909 75 end