##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed: Update of time entry fails when the issue has been moved to an other project....
Jean-Philippe Lang -
r896:e2c606e97459
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,558 +1,551
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 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 layout 'base'
20 20 before_filter :find_project, :except => [ :index, :list, :add ]
21 21 before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy ]
22 22 before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
23 23 accept_key_auth :activity, :calendar
24 24
25 25 cache_sweeper :project_sweeper, :only => [ :add, :edit, :archive, :unarchive, :destroy ]
26 26 cache_sweeper :issue_sweeper, :only => [ :add_issue ]
27 27 cache_sweeper :version_sweeper, :only => [ :add_version ]
28 28
29 29 helper :sort
30 30 include SortHelper
31 31 helper :custom_fields
32 32 include CustomFieldsHelper
33 33 helper :ifpdf
34 34 include IfpdfHelper
35 35 helper :issues
36 36 helper IssuesHelper
37 37 helper :queries
38 38 include QueriesHelper
39 39 helper :repositories
40 40 include RepositoriesHelper
41 41 include ProjectsHelper
42 42
43 43 def index
44 44 list
45 45 render :action => 'list' unless request.xhr?
46 46 end
47 47
48 48 # Lists visible projects
49 49 def list
50 50 projects = Project.find :all,
51 51 :conditions => Project.visible_by(logged_in_user),
52 52 :include => :parent
53 53 @project_tree = projects.group_by {|p| p.parent || p}
54 54 @project_tree.each_key {|p| @project_tree[p] -= [p]}
55 55 end
56 56
57 57 # Add a new project
58 58 def add
59 59 @custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
60 60 @root_projects = Project.find(:all, :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}")
61 61 @project = Project.new(params[:project])
62 62 @project.enabled_module_names = Redmine::AccessControl.available_project_modules
63 63 if request.get?
64 64 @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
65 65 else
66 66 @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
67 67 @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
68 68 @project.custom_values = @custom_values
69 69 if @project.save
70 70 @project.enabled_module_names = params[:enabled_modules]
71 71 flash[:notice] = l(:notice_successful_create)
72 72 redirect_to :controller => 'admin', :action => 'projects'
73 73 end
74 74 end
75 75 end
76 76
77 77 # Show @project
78 78 def show
79 79 @custom_values = @project.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position")
80 80 @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
81 81 @subprojects = @project.active_children
82 82 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
83 83 @trackers = Tracker.find(:all, :order => 'position')
84 84 @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.is_closed=?", @project.id, false])
85 85 @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
86 86 @total_hours = @project.time_entries.sum(:hours)
87 87 @key = User.current.rss_key
88 88 end
89 89
90 90 def settings
91 91 @root_projects = Project::find(:all, :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id])
92 92 @custom_fields = IssueCustomField.find(:all)
93 93 @issue_category ||= IssueCategory.new
94 94 @member ||= @project.members.new
95 95 @custom_values ||= ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
96 96 @repository ||= @project.repository
97 97 @wiki ||= @project.wiki
98 98 end
99 99
100 100 # Edit @project
101 101 def edit
102 102 if request.post?
103 103 @project.custom_fields = IssueCustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
104 104 if params[:custom_fields]
105 105 @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
106 106 @project.custom_values = @custom_values
107 107 end
108 108 @project.attributes = params[:project]
109 109 if @project.save
110 110 flash[:notice] = l(:notice_successful_update)
111 111 redirect_to :action => 'settings', :id => @project
112 112 else
113 113 settings
114 114 render :action => 'settings'
115 115 end
116 116 end
117 117 end
118 118
119 119 def modules
120 120 @project.enabled_module_names = params[:enabled_modules]
121 121 redirect_to :action => 'settings', :id => @project, :tab => 'modules'
122 122 end
123 123
124 124 def archive
125 125 @project.archive if request.post? && @project.active?
126 126 redirect_to :controller => 'admin', :action => 'projects'
127 127 end
128 128
129 129 def unarchive
130 130 @project.unarchive if request.post? && !@project.active?
131 131 redirect_to :controller => 'admin', :action => 'projects'
132 132 end
133 133
134 134 # Delete @project
135 135 def destroy
136 136 @project_to_destroy = @project
137 137 if request.post? and params[:confirm]
138 138 @project_to_destroy.destroy
139 139 redirect_to :controller => 'admin', :action => 'projects'
140 140 end
141 141 # hide project in layout
142 142 @project = nil
143 143 end
144 144
145 145 # Add a new issue category to @project
146 146 def add_issue_category
147 147 @category = @project.issue_categories.build(params[:category])
148 148 if request.post? and @category.save
149 149 respond_to do |format|
150 150 format.html do
151 151 flash[:notice] = l(:notice_successful_create)
152 152 redirect_to :action => 'settings', :tab => 'categories', :id => @project
153 153 end
154 154 format.js do
155 155 # IE doesn't support the replace_html rjs method for select box options
156 156 render(:update) {|page| page.replace "issue_category_id",
157 157 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]')
158 158 }
159 159 end
160 160 end
161 161 end
162 162 end
163 163
164 164 # Add a new version to @project
165 165 def add_version
166 166 @version = @project.versions.build(params[:version])
167 167 if request.post? and @version.save
168 168 flash[:notice] = l(:notice_successful_create)
169 169 redirect_to :action => 'settings', :tab => 'versions', :id => @project
170 170 end
171 171 end
172 172
173 173 # Add a new document to @project
174 174 def add_document
175 175 @document = @project.documents.build(params[:document])
176 176 if request.post? and @document.save
177 177 # Save the attachments
178 178 params[:attachments].each { |a|
179 179 Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
180 180 } if params[:attachments] and params[:attachments].is_a? Array
181 181 flash[:notice] = l(:notice_successful_create)
182 182 Mailer.deliver_document_added(@document) if Setting.notified_events.include?('document_added')
183 183 redirect_to :action => 'list_documents', :id => @project
184 184 end
185 185 end
186 186
187 187 # Show documents list of @project
188 188 def list_documents
189 189 @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
190 190 documents = @project.documents.find :all, :include => [:attachments, :category]
191 191 case @sort_by
192 192 when 'date'
193 193 @grouped = documents.group_by {|d| d.created_on.to_date }
194 194 when 'title'
195 195 @grouped = documents.group_by {|d| d.title.first.upcase}
196 196 when 'author'
197 197 @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
198 198 else
199 199 @grouped = documents.group_by(&:category)
200 200 end
201 201 render :layout => false if request.xhr?
202 202 end
203 203
204 204 # Add a new issue to @project
205 205 # The new issue will be created from an existing one if copy_from parameter is given
206 206 def add_issue
207 207 @issue = params[:copy_from] ? Issue.new.copy_from(params[:copy_from]) : Issue.new(params[:issue])
208 208 @issue.project = @project
209 209 @issue.author = User.current
210 210 @issue.tracker ||= Tracker.find(params[:tracker_id])
211 211
212 212 default_status = IssueStatus.default
213 213 unless default_status
214 214 flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
215 215 render :nothing => true, :layout => true
216 216 return
217 217 end
218 218 @issue.status = default_status
219 219 @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker))if logged_in_user
220 220
221 221 if request.get?
222 222 @issue.start_date ||= Date.today
223 223 @custom_values = @issue.custom_values.empty? ?
224 224 @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) } :
225 225 @issue.custom_values
226 226 else
227 227 requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
228 228 # Check that the user is allowed to apply the requested status
229 229 @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
230 230 @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
231 231 @issue.custom_values = @custom_values
232 232 if @issue.save
233 233 if params[:attachments] && params[:attachments].is_a?(Array)
234 234 # Save attachments
235 235 params[:attachments].each {|a| Attachment.create(:container => @issue, :file => a, :author => User.current) unless a.size == 0}
236 236 end
237 237 flash[:notice] = l(:notice_successful_create)
238 238 Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
239 239 redirect_to :controller => 'issues', :action => 'index', :project_id => @project
240 240 return
241 241 end
242 242 end
243 243 @priorities = Enumeration::get_values('IPRI')
244 244 end
245 245
246 246 # Bulk edit issues
247 247 def bulk_edit_issues
248 248 if request.post?
249 249 status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
250 250 priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
251 251 assigned_to = params[:assigned_to_id].blank? ? nil : User.find_by_id(params[:assigned_to_id])
252 252 category = params[:category_id].blank? ? nil : @project.issue_categories.find_by_id(params[:category_id])
253 253 fixed_version = params[:fixed_version_id].blank? ? nil : @project.versions.find_by_id(params[:fixed_version_id])
254 254 issues = @project.issues.find_all_by_id(params[:issue_ids])
255 255 unsaved_issue_ids = []
256 256 issues.each do |issue|
257 257 journal = issue.init_journal(User.current, params[:notes])
258 258 issue.priority = priority if priority
259 259 issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
260 260 issue.category = category if category
261 261 issue.fixed_version = fixed_version if fixed_version
262 262 issue.start_date = params[:start_date] unless params[:start_date].blank?
263 263 issue.due_date = params[:due_date] unless params[:due_date].blank?
264 264 issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
265 265 # Don't save any change to the issue if the user is not authorized to apply the requested status
266 266 if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
267 267 # Send notification for each issue (if changed)
268 268 Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated')
269 269 else
270 270 # Keep unsaved issue ids to display them in flash error
271 271 unsaved_issue_ids << issue.id
272 272 end
273 273 end
274 274 if unsaved_issue_ids.empty?
275 275 flash[:notice] = l(:notice_successful_update) unless issues.empty?
276 276 else
277 277 flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, issues.size, '#' + unsaved_issue_ids.join(', #'))
278 278 end
279 279 redirect_to :controller => 'issues', :action => 'index', :project_id => @project
280 280 return
281 281 end
282 282 if current_role && User.current.allowed_to?(:change_issue_status, @project)
283 283 # Find potential statuses the user could be allowed to switch issues to
284 284 @available_statuses = Workflow.find(:all, :include => :new_status,
285 285 :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq
286 286 end
287 287 render :update do |page|
288 288 page.hide 'query_form'
289 289 page.replace_html 'bulk-edit', :partial => 'issues/bulk_edit_form'
290 290 end
291 291 end
292 292
293 293 def move_issues
294 294 @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
295 295 redirect_to :controller => 'issues', :action => 'index', :project_id => @project and return unless @issues
296 296 @projects = []
297 297 # find projects to which the user is allowed to move the issue
298 298 if User.current.admin?
299 299 # admin is allowed to move issues to any active (visible) project
300 300 @projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
301 301 else
302 User.current.memberships.each {|m| @projects << m.project if m.role.allowed_to?(:controller => 'projects', :action => 'move_issues')}
302 User.current.memberships.each {|m| @projects << m.project if m.role.allowed_to?(:move_issues)}
303 303 end
304 304 # issue can be moved to any tracker
305 305 @trackers = Tracker.find(:all)
306 306 if request.post? && params[:new_project_id] && @projects.collect(&:id).include?(params[:new_project_id].to_i) && params[:new_tracker_id]
307 307 new_project = Project.find_by_id(params[:new_project_id])
308 new_tracker = Tracker.find_by_id(params[:new_tracker_id])
309 @issues.each do |i|
310 if new_project && i.project_id != new_project.id
311 # issue is moved to another project
312 i.category = nil
313 i.fixed_version = nil
314 # delete issue relations
315 i.relations_from.clear
316 i.relations_to.clear
317 i.project = new_project
318 end
319 if new_tracker
320 i.tracker = new_tracker
321 end
322 i.save
308 new_tracker = params[:new_tracker_id].blank? ? nil : Tracker.find_by_id(params[:new_tracker_id])
309 unsaved_issue_ids = []
310 @issues.each do |issue|
311 unsaved_issue_ids << issue.id unless issue.move_to(new_project, new_tracker)
312 end
313 if unsaved_issue_ids.empty?
314 flash[:notice] = l(:notice_successful_update) unless @issues.empty?
315 else
316 flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
323 317 end
324 flash[:notice] = l(:notice_successful_update)
325 318 redirect_to :controller => 'issues', :action => 'index', :project_id => @project
326 319 end
327 320 end
328 321
329 322 # Add a news to @project
330 323 def add_news
331 324 @news = News.new(:project => @project)
332 325 if request.post?
333 326 @news.attributes = params[:news]
334 327 @news.author_id = self.logged_in_user.id if self.logged_in_user
335 328 if @news.save
336 329 flash[:notice] = l(:notice_successful_create)
337 330 Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
338 331 redirect_to :controller => 'news', :action => 'index', :project_id => @project
339 332 end
340 333 end
341 334 end
342 335
343 336 def add_file
344 337 if request.post?
345 338 @version = @project.versions.find_by_id(params[:version_id])
346 339 # Save the attachments
347 340 @attachments = []
348 341 params[:attachments].each { |file|
349 342 next unless file.size > 0
350 343 a = Attachment.create(:container => @version, :file => file, :author => logged_in_user)
351 344 @attachments << a unless a.new_record?
352 345 } if params[:attachments] and params[:attachments].is_a? Array
353 346 Mailer.deliver_attachments_added(@attachments) if !@attachments.empty? && Setting.notified_events.include?('file_added')
354 347 redirect_to :controller => 'projects', :action => 'list_files', :id => @project
355 348 end
356 349 @versions = @project.versions.sort
357 350 end
358 351
359 352 def list_files
360 353 @versions = @project.versions.sort
361 354 end
362 355
363 356 # Show changelog for @project
364 357 def changelog
365 358 @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
366 359 retrieve_selected_tracker_ids(@trackers)
367 360 @versions = @project.versions.sort
368 361 end
369 362
370 363 def roadmap
371 364 @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
372 365 retrieve_selected_tracker_ids(@trackers)
373 366 @versions = @project.versions.sort
374 367 @versions = @versions.select {|v| !v.completed? } unless params[:completed]
375 368 end
376 369
377 370 def activity
378 371 if params[:year] and params[:year].to_i > 1900
379 372 @year = params[:year].to_i
380 373 if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
381 374 @month = params[:month].to_i
382 375 end
383 376 end
384 377 @year ||= Date.today.year
385 378 @month ||= Date.today.month
386 379
387 380 case params[:format]
388 381 when 'atom'
389 382 # 30 last days
390 383 @date_from = Date.today - 30
391 384 @date_to = Date.today + 1
392 385 else
393 386 # current month
394 387 @date_from = Date.civil(@year, @month, 1)
395 388 @date_to = @date_from >> 1
396 389 end
397 390
398 391 @event_types = %w(issues news files documents changesets wiki_pages messages)
399 392 @event_types.delete('wiki_pages') unless @project.wiki
400 393 @event_types.delete('changesets') unless @project.repository
401 394 @event_types.delete('messages') unless @project.boards.any?
402 395 # only show what the user is allowed to view
403 396 @event_types = @event_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
404 397
405 398 @scope = @event_types.select {|t| params["show_#{t}"]}
406 399 # default events if none is specified in parameters
407 400 @scope = (@event_types - %w(wiki_pages messages))if @scope.empty?
408 401
409 402 @events = []
410 403
411 404 if @scope.include?('issues')
412 405 @events += @project.issues.find(:all, :include => [:author, :tracker], :conditions => ["#{Issue.table_name}.created_on>=? and #{Issue.table_name}.created_on<=?", @date_from, @date_to] )
413 406 @events += @project.issues_status_changes(@date_from, @date_to)
414 407 end
415 408
416 409 if @scope.include?('news')
417 410 @events += @project.news.find(:all, :conditions => ["#{News.table_name}.created_on>=? and #{News.table_name}.created_on<=?", @date_from, @date_to], :include => :author )
418 411 end
419 412
420 413 if @scope.include?('files')
421 414 @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*", :joins => "LEFT JOIN #{Version.table_name} ON #{Version.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Version' and #{Version.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author )
422 415 end
423 416
424 417 if @scope.include?('documents')
425 418 @events += @project.documents.find(:all, :conditions => ["#{Document.table_name}.created_on>=? and #{Document.table_name}.created_on<=?", @date_from, @date_to] )
426 419 @events += Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN #{Document.table_name} ON #{Document.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Document' and #{Document.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author )
427 420 end
428 421
429 422 if @scope.include?('wiki_pages')
430 423 select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
431 424 "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title, " +
432 425 "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " +
433 426 "#{WikiContent.versioned_table_name}.id"
434 427 joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
435 428 "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id "
436 429 conditions = ["#{Wiki.table_name}.project_id = ? AND #{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?",
437 430 @project.id, @date_from, @date_to]
438 431
439 432 @events += WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions)
440 433 end
441 434
442 435 if @scope.include?('changesets')
443 436 @events += @project.repository.changesets.find(:all, :conditions => ["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to])
444 437 end
445 438
446 439 if @scope.include?('messages')
447 440 @events += Message.find(:all,
448 441 :include => [:board, :author],
449 442 :conditions => ["#{Board.table_name}.project_id=? AND #{Message.table_name}.parent_id IS NULL AND #{Message.table_name}.created_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
450 443 end
451 444
452 445 @events_by_day = @events.group_by(&:event_date)
453 446
454 447 respond_to do |format|
455 448 format.html { render :layout => false if request.xhr? }
456 449 format.atom { render_feed(@events, :title => "#{@project.name}: #{l(:label_activity)}") }
457 450 end
458 451 end
459 452
460 453 def calendar
461 454 @trackers = Tracker.find(:all, :order => 'position')
462 455 retrieve_selected_tracker_ids(@trackers)
463 456
464 457 if params[:year] and params[:year].to_i > 1900
465 458 @year = params[:year].to_i
466 459 if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
467 460 @month = params[:month].to_i
468 461 end
469 462 end
470 463 @year ||= Date.today.year
471 464 @month ||= Date.today.month
472 465 @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
473 466
474 467 events = []
475 468 @project.issues_with_subprojects(params[:with_subprojects]) do
476 469 events += Issue.find(:all,
477 470 :include => [:tracker, :status, :assigned_to, :priority, :project],
478 471 :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?)) AND #{Issue.table_name}.tracker_id IN (#{@selected_tracker_ids.join(',')})", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
479 472 ) unless @selected_tracker_ids.empty?
480 473 end
481 474 events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
482 475 @calendar.events = events
483 476
484 477 render :layout => false if request.xhr?
485 478 end
486 479
487 480 def gantt
488 481 @trackers = Tracker.find(:all, :order => 'position')
489 482 retrieve_selected_tracker_ids(@trackers)
490 483
491 484 if params[:year] and params[:year].to_i >0
492 485 @year_from = params[:year].to_i
493 486 if params[:month] and params[:month].to_i >=1 and params[:month].to_i <= 12
494 487 @month_from = params[:month].to_i
495 488 else
496 489 @month_from = 1
497 490 end
498 491 else
499 492 @month_from ||= Date.today.month
500 493 @year_from ||= Date.today.year
501 494 end
502 495
503 496 zoom = (params[:zoom] || User.current.pref[:gantt_zoom]).to_i
504 497 @zoom = (zoom > 0 && zoom < 5) ? zoom : 2
505 498 months = (params[:months] || User.current.pref[:gantt_months]).to_i
506 499 @months = (months > 0 && months < 25) ? months : 6
507 500
508 501 # Save gantt paramters as user preference (zoom and months count)
509 502 if (User.current.logged? && (@zoom != User.current.pref[:gantt_zoom] || @months != User.current.pref[:gantt_months]))
510 503 User.current.pref[:gantt_zoom], User.current.pref[:gantt_months] = @zoom, @months
511 504 User.current.preference.save
512 505 end
513 506
514 507 @date_from = Date.civil(@year_from, @month_from, 1)
515 508 @date_to = (@date_from >> @months) - 1
516 509
517 510 @events = []
518 511 @project.issues_with_subprojects(params[:with_subprojects]) do
519 512 @events += Issue.find(:all,
520 513 :order => "start_date, due_date",
521 514 :include => [:tracker, :status, :assigned_to, :priority, :project],
522 515 :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
523 516 ) unless @selected_tracker_ids.empty?
524 517 end
525 518 @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
526 519 @events.sort! {|x,y| x.start_date <=> y.start_date }
527 520
528 521 if params[:format]=='pdf'
529 522 @options_for_rfpdf ||= {}
530 523 @options_for_rfpdf[:file_name] = "#{@project.identifier}-gantt.pdf"
531 524 render :template => "projects/gantt.rfpdf", :layout => false
532 525 elsif params[:format]=='png' && respond_to?('gantt_image')
533 526 image = gantt_image(@events, @date_from, @months, @zoom)
534 527 image.format = 'PNG'
535 528 send_data(image.to_blob, :disposition => 'inline', :type => 'image/png', :filename => "#{@project.identifier}-gantt.png")
536 529 else
537 530 render :template => "projects/gantt.rhtml"
538 531 end
539 532 end
540 533
541 534 private
542 535 # Find project of id params[:id]
543 536 # if not found, redirect to project list
544 537 # Used as a before_filter
545 538 def find_project
546 539 @project = Project.find(params[:id])
547 540 rescue ActiveRecord::RecordNotFound
548 541 render_404
549 542 end
550 543
551 544 def retrieve_selected_tracker_ids(selectable_trackers)
552 545 if ids = params[:tracker_ids]
553 546 @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
554 547 else
555 548 @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
556 549 end
557 550 end
558 551 end
Show file before | Show file after | Hide comments
@@ -1,191 +1,217
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 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 Issue < ActiveRecord::Base
19 19 belongs_to :project
20 20 belongs_to :tracker
21 21 belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
22 22 belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
23 23 belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
24 24 belongs_to :fixed_version, :class_name => 'Version', :foreign_key => 'fixed_version_id'
25 25 belongs_to :priority, :class_name => 'Enumeration', :foreign_key => 'priority_id'
26 26 belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
27 27
28 28 has_many :journals, :as => :journalized, :dependent => :destroy
29 29 has_many :attachments, :as => :container, :dependent => :destroy
30 30 has_many :time_entries, :dependent => :nullify
31 31 has_many :custom_values, :dependent => :delete_all, :as => :customized
32 32 has_many :custom_fields, :through => :custom_values
33 33 has_and_belongs_to_many :changesets, :order => "revision ASC"
34 34
35 35 has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
36 36 has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
37 37
38 38 acts_as_watchable
39 39 acts_as_searchable :columns => ['subject', 'description'], :with => {:journal => :issue}
40 40 acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
41 41 :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}
42 42
43 43 validates_presence_of :subject, :description, :priority, :tracker, :author, :status
44 44 validates_length_of :subject, :maximum => 255
45 45 validates_inclusion_of :done_ratio, :in => 0..100
46 46 validates_numericality_of :estimated_hours, :allow_nil => true
47 47 validates_associated :custom_values, :on => :update
48 48
49 49 def after_initialize
50 50 if new_record?
51 51 # set default values for new records only
52 52 self.status ||= IssueStatus.default
53 53 self.priority ||= Enumeration.default('IPRI')
54 54 end
55 55 end
56 56
57 57 def copy_from(arg)
58 58 issue = arg.is_a?(Issue) ? arg : Issue.find(arg)
59 59 self.attributes = issue.attributes.dup
60 60 self.custom_values = issue.custom_values.collect {|v| v.clone}
61 61 self
62 62 end
63 63
64 # Move an issue to a new project and tracker
65 def move_to(new_project, new_tracker = nil)
66 transaction do
67 if new_project && project_id != new_project.id
68 # delete issue relations
69 self.relations_from.clear
70 self.relations_to.clear
71 # issue is moved to another project
72 self.category = nil
73 self.fixed_version = nil
74 self.project = new_project
75 end
76 if new_tracker
77 self.tracker = new_tracker
78 end
79 if save
80 # Manually update project_id on related time entries
81 TimeEntry.update_all("project_id = #{new_project.id}", {:issue_id => id})
82 else
83 rollback_db_transaction
84 return false
85 end
86 end
87 return true
88 end
89
64 90 def priority_id=(pid)
65 91 self.priority = nil
66 92 write_attribute(:priority_id, pid)
67 93 end
68 94
69 95 def validate
70 96 if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
71 97 errors.add :due_date, :activerecord_error_not_a_date
72 98 end
73 99
74 100 if self.due_date and self.start_date and self.due_date < self.start_date
75 101 errors.add :due_date, :activerecord_error_greater_than_start_date
76 102 end
77 103
78 104 if start_date && soonest_start && start_date < soonest_start
79 105 errors.add :start_date, :activerecord_error_invalid
80 106 end
81 107 end
82 108
83 109 def before_create
84 110 # default assignment based on category
85 111 if assigned_to.nil? && category && category.assigned_to
86 112 self.assigned_to = category.assigned_to
87 113 end
88 114 end
89 115
90 116 def before_save
91 117 if @current_journal
92 118 # attributes changes
93 119 (Issue.column_names - %w(id description)).each {|c|
94 120 @current_journal.details << JournalDetail.new(:property => 'attr',
95 121 :prop_key => c,
96 122 :old_value => @issue_before_change.send(c),
97 123 :value => send(c)) unless send(c)==@issue_before_change.send(c)
98 124 }
99 125 # custom fields changes
100 126 custom_values.each {|c|
101 127 next if (@custom_values_before_change[c.custom_field_id]==c.value ||
102 128 (@custom_values_before_change[c.custom_field_id].blank? && c.value.blank?))
103 129 @current_journal.details << JournalDetail.new(:property => 'cf',
104 130 :prop_key => c.custom_field_id,
105 131 :old_value => @custom_values_before_change[c.custom_field_id],
106 132 :value => c.value)
107 133 }
108 134 @current_journal.save
109 135 end
110 136 # Save the issue even if the journal is not saved (because empty)
111 137 true
112 138 end
113 139
114 140 def after_save
115 141 # Update start/due dates of following issues
116 142 relations_from.each(&:set_issue_to_dates)
117 143
118 144 # Close duplicates if the issue was closed
119 145 if @issue_before_change && !@issue_before_change.closed? && self.closed?
120 146 duplicates.each do |duplicate|
121 147 # Don't re-close it if it's already closed
122 148 next if duplicate.closed?
123 149 # Same user and notes
124 150 duplicate.init_journal(@current_journal.user, @current_journal.notes)
125 151 duplicate.update_attribute :status, self.status
126 152 end
127 153 end
128 154 end
129 155
130 156 def custom_value_for(custom_field)
131 157 self.custom_values.each {|v| return v if v.custom_field_id == custom_field.id }
132 158 return nil
133 159 end
134 160
135 161 def init_journal(user, notes = "")
136 162 @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
137 163 @issue_before_change = self.clone
138 164 @custom_values_before_change = {}
139 165 self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
140 166 @current_journal
141 167 end
142 168
143 169 # Return true if the issue is closed, otherwise false
144 170 def closed?
145 171 self.status.is_closed?
146 172 end
147 173
148 174 # Users the issue can be assigned to
149 175 def assignable_users
150 176 project.assignable_users
151 177 end
152 178
153 179 # Returns the mail adresses of users that should be notified for the issue
154 180 def recipients
155 181 recipients = project.recipients
156 182 # Author and assignee are always notified
157 183 recipients << author.mail if author
158 184 recipients << assigned_to.mail if assigned_to
159 185 recipients.compact.uniq
160 186 end
161 187
162 188 def spent_hours
163 189 @spent_hours ||= time_entries.sum(:hours) || 0
164 190 end
165 191
166 192 def relations
167 193 (relations_from + relations_to).sort
168 194 end
169 195
170 196 def all_dependent_issues
171 197 dependencies = []
172 198 relations_from.each do |relation|
173 199 dependencies << relation.issue_to
174 200 dependencies += relation.issue_to.all_dependent_issues
175 201 end
176 202 dependencies
177 203 end
178 204
179 205 # Returns an array of the duplicate issues
180 206 def duplicates
181 207 relations.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.other_issue(self)}
182 208 end
183 209
184 210 def duration
185 211 (start_date && due_date) ? due_date - start_date : 0
186 212 end
187 213
188 214 def soonest_start
189 215 @soonest_start ||= relations_to.collect{|relation| relation.successor_soonest_start}.compact.min
190 216 end
191 217 end
Show file before | Show file after | Hide comments
@@ -1,73 +1,73
1 1 <% if @query.new_record? %>
2 2 <h2><%=l(:label_issue_plural)%></h2>
3 3 <% set_html_title l(:label_issue_plural) %>
4 4
5 5 <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
6 6 <%= hidden_field_tag('project_id', @project.id) if @project %>
7 7 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
8 8 <div class="contextual">
9 9 <%= link_to_remote l(:button_apply),
10 10 { :url => { :set_filter => 1 },
11 11 :update => "content",
12 12 :with => "Form.serialize('query_form')"
13 }, :class => 'icon icon-edit' %>
13 }, :class => 'icon icon-checked' %>
14 14
15 15 <%= link_to_remote l(:button_clear),
16 16 { :url => { :set_filter => 1 },
17 17 :update => "content",
18 18 }, :class => 'icon icon-reload' %>
19 19
20 20 <% if current_role && current_role.allowed_to?(:save_queries) %>
21 21 <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
22 22 <% end %>
23 23 </div>
24 24 <br />
25 25 &nbsp;
26 26 <% end %>
27 27 <% else %>
28 28 <div class="contextual">
29 29 <% if @query.editable_by?(User.current) %>
30 30 <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
31 31 <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
32 32 <% end %>
33 33 </div>
34 34
35 35 <h2><%= @query.name %></h2>
36 36 <div id="query_form"></div>
37 37 <% set_html_title @query.name %>
38 38 <% end %>
39 39 <%= error_messages_for 'query' %>
40 40 <% if @query.valid? %>
41 41 <% if @issues.empty? %>
42 42 <p class="nodata"><%= l(:label_no_data) %></p>
43 43 <% else %>
44 44 <% form_tag({:controller => 'projects', :action => 'bulk_edit_issues', :id => @project}, :id => 'issues_form', :onsubmit => "if (!checkBulkEdit(this)) {alert('#{l(:notice_no_issue_selected)}'); return false;}" ) do %>
45 45 <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
46 46 <div class="contextual">
47 47 <%= l(:label_export_to) %>
48 48 <%= link_to 'CSV', {:format => 'csv'}, :class => 'icon icon-csv' %>,
49 49 <%= link_to 'PDF', {:format => 'pdf'}, :class => 'icon icon-pdf' %>
50 50 </div>
51 51 <p><%= pagination_links_full @issue_pages %>
52 52 [ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]</p>
53 53 <% end %>
54 54 <% end %>
55 55 <% end %>
56 56
57 57 <% content_for :sidebar do %>
58 58 <%= render :partial => 'issues/sidebar' %>
59 59 <% end if @project%>
60 60
61 61 <% content_for :header_tags do %>
62 62 <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
63 63 <%= auto_discovery_link_tag(:atom, {:action => 'changes', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
64 64 <%= javascript_include_tag 'calendar/calendar' %>
65 65 <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
66 66 <%= javascript_include_tag 'calendar/calendar-setup' %>
67 67 <%= stylesheet_link_tag 'calendar' %>
68 68 <%= javascript_include_tag 'context_menu' %>
69 69 <%= stylesheet_link_tag 'context_menu' %>
70 70 <% end %>
71 71
72 72 <div id="context-menu" style="display: none;"></div>
73 73 <%= javascript_tag 'new ContextMenu({})' %>
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Hide comments
@@ -1,62 +1,73
1 1 # redMine - project management software
2 2 # Copyright (C) 2006-2007 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 require File.dirname(__FILE__) + '/../test_helper'
19 19
20 20 class IssueTest < Test::Unit::TestCase
21 fixtures :projects, :users, :members, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values
21 fixtures :projects, :users, :members, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :time_entries
22 22
23 23 def test_category_based_assignment
24 24 issue = Issue.create(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Assignment test', :description => 'Assignment test', :category_id => 1)
25 25 assert_equal IssueCategory.find(1).assigned_to, issue.assigned_to
26 26 end
27 27
28 28 def test_copy
29 29 issue = Issue.new.copy_from(1)
30 30 assert issue.save
31 31 issue.reload
32 32 orig = Issue.find(1)
33 33 assert_equal orig.subject, issue.subject
34 34 assert_equal orig.tracker, issue.tracker
35 35 assert_equal orig.custom_values.first.value, issue.custom_values.first.value
36 36 end
37 37
38 38 def test_close_duplicates
39 39 # Create 3 issues
40 40 issue1 = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Duplicates test', :description => 'Duplicates test')
41 41 assert issue1.save
42 42 issue2 = issue1.clone
43 43 assert issue2.save
44 44 issue3 = issue1.clone
45 45 assert issue3.save
46 46
47 47 # 2 is a dupe of 1
48 48 IssueRelation.create(:issue_from => issue1, :issue_to => issue2, :relation_type => IssueRelation::TYPE_DUPLICATES)
49 49 # And 3 is a dupe of 2
50 50 IssueRelation.create(:issue_from => issue2, :issue_to => issue3, :relation_type => IssueRelation::TYPE_DUPLICATES)
51 51
52 52 assert issue1.reload.duplicates.include?(issue2)
53 53
54 54 # Closing issue 1
55 55 issue1.init_journal(User.find(:first), "Closing issue1")
56 56 issue1.status = IssueStatus.find :first, :conditions => {:is_closed => true}
57 57 assert issue1.save
58 58 # 2 and 3 should be also closed
59 59 assert issue2.reload.closed?
60 60 assert issue3.reload.closed?
61 61 end
62
63 def test_move_to_another_project
64 issue = Issue.find(1)
65 assert issue.move_to(Project.find(2))
66 issue.reload
67 assert_equal 2, issue.project_id
68 # Category removed
69 assert_nil issue.category
70 # Make sure time entries were move to the target project
71 assert_equal 2, issue.time_entries.first.project_id
72 end
62 73 end
General Comments 0
You need to be logged in to leave comments. Login now