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