##// END OF EJS Templates
Add etag check on the activity view to avoid rendering when not modified....
Jean-Philippe Lang -
r2868:a658679d29eb
parent child
Show More
@@ -1,347 +1,349
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2009 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 ProjectsController < ApplicationController
19 19 menu_item :overview
20 20 menu_item :activity, :only => :activity
21 21 menu_item :roadmap, :only => :roadmap
22 22 menu_item :files, :only => [:list_files, :add_file]
23 23 menu_item :settings, :only => :settings
24 24 menu_item :issues, :only => [:changelog]
25 25
26 26 before_filter :find_project, :except => [ :index, :list, :add, :copy, :activity ]
27 27 before_filter :find_optional_project, :only => :activity
28 28 before_filter :authorize, :except => [ :index, :list, :add, :copy, :archive, :unarchive, :destroy, :activity ]
29 29 before_filter :authorize_global, :only => :add
30 30 before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
31 31 accept_key_auth :activity
32 32
33 33 after_filter :only => [:add, :edit, :archive, :unarchive, :destroy] do |controller|
34 34 if controller.request.post?
35 35 controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt'
36 36 end
37 37 end
38 38
39 39 helper :sort
40 40 include SortHelper
41 41 helper :custom_fields
42 42 include CustomFieldsHelper
43 43 helper :issues
44 44 helper IssuesHelper
45 45 helper :queries
46 46 include QueriesHelper
47 47 helper :repositories
48 48 include RepositoriesHelper
49 49 include ProjectsHelper
50 50
51 51 # Lists visible projects
52 52 def index
53 53 respond_to do |format|
54 54 format.html {
55 55 @projects = Project.visible.find(:all, :order => 'lft')
56 56 }
57 57 format.atom {
58 58 projects = Project.visible.find(:all, :order => 'created_on DESC',
59 59 :limit => Setting.feeds_limit.to_i)
60 60 render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
61 61 }
62 62 end
63 63 end
64 64
65 65 # Add a new project
66 66 def add
67 67 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
68 68 @trackers = Tracker.all
69 69 @project = Project.new(params[:project])
70 70 if request.get?
71 71 @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
72 72 @project.trackers = Tracker.all
73 73 @project.is_public = Setting.default_projects_public?
74 74 @project.enabled_module_names = Redmine::AccessControl.available_project_modules
75 75 else
76 76 @project.enabled_module_names = params[:enabled_modules]
77 77 if @project.save
78 78 @project.set_parent!(params[:project]['parent_id']) if User.current.admin? && params[:project].has_key?('parent_id')
79 79 # Add current user as a project member if he is not admin
80 80 unless User.current.admin?
81 81 r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
82 82 m = Member.new(:user => User.current, :roles => [r])
83 83 @project.members << m
84 84 end
85 85 flash[:notice] = l(:notice_successful_create)
86 86 redirect_to :controller => 'projects', :action => 'settings', :id => @project
87 87 end
88 88 end
89 89 end
90 90
91 91 def copy
92 92 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
93 93 @trackers = Tracker.all
94 94 @root_projects = Project.find(:all,
95 95 :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
96 96 :order => 'name')
97 97 @source_project = Project.find(params[:id])
98 98 if request.get?
99 99 @project = Project.copy_from(@source_project)
100 100 if @project
101 101 @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
102 102 else
103 103 redirect_to :controller => 'admin', :action => 'projects'
104 104 end
105 105 else
106 106 @project = Project.new(params[:project])
107 107 @project.enabled_module_names = params[:enabled_modules]
108 108 if @project.copy(@source_project, :only => params[:only])
109 109 @project.set_parent!(params[:project]['parent_id']) if User.current.admin? && params[:project].has_key?('parent_id')
110 110 flash[:notice] = l(:notice_successful_create)
111 111 redirect_to :controller => 'admin', :action => 'projects'
112 112 end
113 113 end
114 114 end
115 115
116 116
117 117 # Show @project
118 118 def show
119 119 if params[:jump]
120 120 # try to redirect to the requested menu item
121 121 redirect_to_project_menu_item(@project, params[:jump]) && return
122 122 end
123 123
124 124 @users_by_role = @project.users_by_role
125 125 @subprojects = @project.children.visible
126 126 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
127 127 @trackers = @project.rolled_up_trackers
128 128
129 129 cond = @project.project_condition(Setting.display_subprojects_issues?)
130 130
131 131 @open_issues_by_tracker = Issue.visible.count(:group => :tracker,
132 132 :include => [:project, :status, :tracker],
133 133 :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
134 134 @total_issues_by_tracker = Issue.visible.count(:group => :tracker,
135 135 :include => [:project, :status, :tracker],
136 136 :conditions => cond)
137 137
138 138 TimeEntry.visible_by(User.current) do
139 139 @total_hours = TimeEntry.sum(:hours,
140 140 :include => :project,
141 141 :conditions => cond).to_f
142 142 end
143 143 @key = User.current.rss_key
144 144 end
145 145
146 146 def settings
147 147 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
148 148 @issue_category ||= IssueCategory.new
149 149 @member ||= @project.members.new
150 150 @trackers = Tracker.all
151 151 @repository ||= @project.repository
152 152 @wiki ||= @project.wiki
153 153 end
154 154
155 155 # Edit @project
156 156 def edit
157 157 if request.post?
158 158 @project.attributes = params[:project]
159 159 if @project.save
160 160 @project.set_parent!(params[:project]['parent_id']) if User.current.admin? && params[:project].has_key?('parent_id')
161 161 flash[:notice] = l(:notice_successful_update)
162 162 redirect_to :action => 'settings', :id => @project
163 163 else
164 164 settings
165 165 render :action => 'settings'
166 166 end
167 167 end
168 168 end
169 169
170 170 def modules
171 171 @project.enabled_module_names = params[:enabled_modules]
172 172 redirect_to :action => 'settings', :id => @project, :tab => 'modules'
173 173 end
174 174
175 175 def archive
176 176 @project.archive if request.post? && @project.active?
177 177 redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
178 178 end
179 179
180 180 def unarchive
181 181 @project.unarchive if request.post? && !@project.active?
182 182 redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
183 183 end
184 184
185 185 # Delete @project
186 186 def destroy
187 187 @project_to_destroy = @project
188 188 if request.post? and params[:confirm]
189 189 @project_to_destroy.destroy
190 190 redirect_to :controller => 'admin', :action => 'projects'
191 191 end
192 192 # hide project in layout
193 193 @project = nil
194 194 end
195 195
196 196 # Add a new issue category to @project
197 197 def add_issue_category
198 198 @category = @project.issue_categories.build(params[:category])
199 199 if request.post? and @category.save
200 200 respond_to do |format|
201 201 format.html do
202 202 flash[:notice] = l(:notice_successful_create)
203 203 redirect_to :action => 'settings', :tab => 'categories', :id => @project
204 204 end
205 205 format.js do
206 206 # IE doesn't support the replace_html rjs method for select box options
207 207 render(:update) {|page| page.replace "issue_category_id",
208 208 content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
209 209 }
210 210 end
211 211 end
212 212 end
213 213 end
214 214
215 215 # Add a new version to @project
216 216 def add_version
217 217 @version = @project.versions.build(params[:version])
218 218 if request.post? and @version.save
219 219 flash[:notice] = l(:notice_successful_create)
220 220 redirect_to :action => 'settings', :tab => 'versions', :id => @project
221 221 end
222 222 end
223 223
224 224 def add_file
225 225 if request.post?
226 226 container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
227 227 attachments = attach_files(container, params[:attachments])
228 228 if !attachments.empty? && Setting.notified_events.include?('file_added')
229 229 Mailer.deliver_attachments_added(attachments)
230 230 end
231 231 redirect_to :controller => 'projects', :action => 'list_files', :id => @project
232 232 return
233 233 end
234 234 @versions = @project.versions.sort
235 235 end
236 236
237 237 def save_activities
238 238 if request.post? && params[:enumerations]
239 239 Project.transaction do
240 240 params[:enumerations].each do |id, activity|
241 241 @project.update_or_create_time_entry_activity(id, activity)
242 242 end
243 243 end
244 244 end
245 245
246 246 redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
247 247 end
248 248
249 249 def reset_activities
250 250 @project.time_entry_activities.each do |time_entry_activity|
251 251 time_entry_activity.destroy(time_entry_activity.parent)
252 252 end
253 253 redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
254 254 end
255 255
256 256 def list_files
257 257 sort_init 'filename', 'asc'
258 258 sort_update 'filename' => "#{Attachment.table_name}.filename",
259 259 'created_on' => "#{Attachment.table_name}.created_on",
260 260 'size' => "#{Attachment.table_name}.filesize",
261 261 'downloads' => "#{Attachment.table_name}.downloads"
262 262
263 263 @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
264 264 @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
265 265 render :layout => !request.xhr?
266 266 end
267 267
268 268 # Show changelog for @project
269 269 def changelog
270 270 @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
271 271 retrieve_selected_tracker_ids(@trackers)
272 272 @versions = @project.versions.sort
273 273 end
274 274
275 275 def roadmap
276 276 @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
277 277 retrieve_selected_tracker_ids(@trackers)
278 278 @versions = @project.versions.sort
279 279 @versions = @versions.select {|v| !v.completed? } unless params[:completed]
280 280 end
281 281
282 282 def activity
283 283 @days = Setting.activity_days_default.to_i
284 284
285 285 if params[:from]
286 286 begin; @date_to = params[:from].to_date + 1; rescue; end
287 287 end
288 288
289 289 @date_to ||= Date.today + 1
290 290 @date_from = @date_to - @days
291 291 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
292 292 @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
293 293
294 294 @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
295 295 :with_subprojects => @with_subprojects,
296 296 :author => @author)
297 297 @activity.scope_select {|t| !params["show_#{t}"].nil?}
298 298 @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
299 299
300 300 events = @activity.events(@date_from, @date_to)
301 301
302 respond_to do |format|
303 format.html {
304 @events_by_day = events.group_by(&:event_date)
305 render :layout => false if request.xhr?
306 }
307 format.atom {
308 title = l(:label_activity)
309 if @author
310 title = @author.name
311 elsif @activity.scope.size == 1
312 title = l("label_#{@activity.scope.first.singularize}_plural")
313 end
314 render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
315 }
302 if events.empty? || stale?(:etag => [events.first, User.current])
303 respond_to do |format|
304 format.html {
305 @events_by_day = events.group_by(&:event_date)
306 render :layout => false if request.xhr?
307 }
308 format.atom {
309 title = l(:label_activity)
310 if @author
311 title = @author.name
312 elsif @activity.scope.size == 1
313 title = l("label_#{@activity.scope.first.singularize}_plural")
314 end
315 render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
316 }
317 end
316 318 end
317 319
318 320 rescue ActiveRecord::RecordNotFound
319 321 render_404
320 322 end
321 323
322 324 private
323 325 # Find project of id params[:id]
324 326 # if not found, redirect to project list
325 327 # Used as a before_filter
326 328 def find_project
327 329 @project = Project.find(params[:id])
328 330 rescue ActiveRecord::RecordNotFound
329 331 render_404
330 332 end
331 333
332 334 def find_optional_project
333 335 return true unless params[:id]
334 336 @project = Project.find(params[:id])
335 337 authorize
336 338 rescue ActiveRecord::RecordNotFound
337 339 render_404
338 340 end
339 341
340 342 def retrieve_selected_tracker_ids(selectable_trackers)
341 343 if ids = params[:tracker_ids]
342 344 @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
343 345 else
344 346 @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
345 347 end
346 348 end
347 349 end
@@ -1,93 +1,95
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2008 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 module Redmine
19 19 module Activity
20 20 # Class used to retrieve activity events
21 21 class Fetcher
22 22 attr_reader :user, :project, :scope
23 23
24 24 # Needs to be unloaded in development mode
25 25 @@constantized_providers = Hash.new {|h,k| h[k] = Redmine::Activity.providers[k].collect {|t| t.constantize } }
26 26
27 27 def initialize(user, options={})
28 28 options.assert_valid_keys(:project, :with_subprojects, :author)
29 29 @user = user
30 30 @project = options[:project]
31 31 @options = options
32 32
33 33 @scope = event_types
34 34 end
35 35
36 36 # Returns an array of available event types
37 37 def event_types
38 38 return @event_types unless @event_types.nil?
39 39
40 40 @event_types = Redmine::Activity.available_event_types
41 41 @event_types = @event_types.select {|o| @user.allowed_to?("view_#{o}".to_sym, @project)} if @project
42 42 @event_types
43 43 end
44 44
45 45 # Yields to filter the activity scope
46 46 def scope_select(&block)
47 47 @scope = @scope.select {|t| yield t }
48 48 end
49 49
50 50 # Sets the scope
51 51 # Argument can be :all, :default or an array of event types
52 52 def scope=(s)
53 53 case s
54 54 when :all
55 55 @scope = event_types
56 56 when :default
57 57 default_scope!
58 58 else
59 59 @scope = s & event_types
60 60 end
61 61 end
62 62
63 63 # Resets the scope to the default scope
64 64 def default_scope!
65 65 @scope = Redmine::Activity.default_event_types
66 66 end
67 67
68 68 # Returns an array of events for the given date range
69 # sorted in reverse chronological order
69 70 def events(from = nil, to = nil, options={})
70 71 e = []
71 72 @options[:limit] = options[:limit]
72 73
73 74 @scope.each do |event_type|
74 75 constantized_providers(event_type).each do |provider|
75 76 e += provider.find_events(event_type, @user, from, to, @options)
76 77 end
77 78 end
78 79
80 e.sort! {|a,b| b.event_datetime <=> a.event_datetime}
81
79 82 if options[:limit]
80 e.sort! {|a,b| b.event_date <=> a.event_date}
81 83 e = e.slice(0, options[:limit])
82 84 end
83 85 e
84 86 end
85 87
86 88 private
87 89
88 90 def constantized_providers(event_type)
89 91 @@constantized_providers[event_type]
90 92 end
91 93 end
92 94 end
93 95 end
General Comments 0
You need to be logged in to leave comments. Login now