##// END OF EJS Templates
Un-inline statement....
Jean-Philippe Lang -
r13335:9dae5771bc8d
parent child
Show More
@@ -1,75 +1,77
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2014 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class ActivitiesController < ApplicationController
19 19 menu_item :activity
20 20 before_filter :find_optional_project
21 21 accept_rss_auth :index
22 22
23 23 def index
24 24 @days = Setting.activity_days_default.to_i
25 25
26 26 if params[:from]
27 27 begin; @date_to = params[:from].to_date + 1; rescue; end
28 28 end
29 29
30 30 @date_to ||= Date.today + 1
31 31 @date_from = @date_to - @days
32 32 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
33 @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
33 if params[:user_id].present?
34 @author = User.active.find(params[:user_id])
35 end
34 36
35 37 @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
36 38 :with_subprojects => @with_subprojects,
37 39 :author => @author)
38 40 @activity.scope_select {|t| !params["show_#{t}"].nil?}
39 41 @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
40 42
41 43 events = @activity.events(@date_from, @date_to)
42 44
43 45 if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, events.size, User.current, current_language])
44 46 respond_to do |format|
45 47 format.html {
46 48 @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
47 49 render :layout => false if request.xhr?
48 50 }
49 51 format.atom {
50 52 title = l(:label_activity)
51 53 if @author
52 54 title = @author.name
53 55 elsif @activity.scope.size == 1
54 56 title = l("label_#{@activity.scope.first.singularize}_plural")
55 57 end
56 58 render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
57 59 }
58 60 end
59 61 end
60 62
61 63 rescue ActiveRecord::RecordNotFound
62 64 render_404
63 65 end
64 66
65 67 private
66 68
67 69 # TODO: refactor, duplicated in projects_controller
68 70 def find_optional_project
69 71 return true unless params[:id]
70 72 @project = Project.find(params[:id])
71 73 authorize
72 74 rescue ActiveRecord::RecordNotFound
73 75 render_404
74 76 end
75 77 end
General Comments 0
You need to be logged in to leave comments. Login now