##// END OF EJS Templates
Merged r14268 (#19815)....
Jean-Philippe Lang -
r13896:84a40b16f18c
parent child
Show More

The requested changes are too big and content was truncated. Show full diff

@@ -1,485 +1,488
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2015 Jean-Philippe Lang
2 # Copyright (C) 2006-2015 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 class IssuesController < ApplicationController
18 class IssuesController < ApplicationController
19 menu_item :new_issue, :only => [:new, :create]
19 menu_item :new_issue, :only => [:new, :create]
20 default_search_scope :issues
20 default_search_scope :issues
21
21
22 before_filter :find_issue, :only => [:show, :edit, :update]
22 before_filter :find_issue, :only => [:show, :edit, :update]
23 before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
23 before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
24 before_filter :find_project, :only => [:new, :create, :update_form]
24 before_filter :find_project, :only => [:new, :create, :update_form]
25 before_filter :authorize, :except => [:index]
25 before_filter :authorize, :except => [:index]
26 before_filter :find_optional_project, :only => [:index]
26 before_filter :find_optional_project, :only => [:index]
27 before_filter :check_for_default_issue_status, :only => [:new, :create]
27 before_filter :check_for_default_issue_status, :only => [:new, :create]
28 before_filter :build_new_issue_from_params, :only => [:new, :create, :update_form]
28 before_filter :build_new_issue_from_params, :only => [:new, :create, :update_form]
29 accept_rss_auth :index, :show
29 accept_rss_auth :index, :show
30 accept_api_auth :index, :show, :create, :update, :destroy
30 accept_api_auth :index, :show, :create, :update, :destroy
31
31
32 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
32 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
33
33
34 helper :journals
34 helper :journals
35 helper :projects
35 helper :projects
36 include ProjectsHelper
36 include ProjectsHelper
37 helper :custom_fields
37 helper :custom_fields
38 include CustomFieldsHelper
38 include CustomFieldsHelper
39 helper :issue_relations
39 helper :issue_relations
40 include IssueRelationsHelper
40 include IssueRelationsHelper
41 helper :watchers
41 helper :watchers
42 include WatchersHelper
42 include WatchersHelper
43 helper :attachments
43 helper :attachments
44 include AttachmentsHelper
44 include AttachmentsHelper
45 helper :queries
45 helper :queries
46 include QueriesHelper
46 include QueriesHelper
47 helper :repositories
47 helper :repositories
48 include RepositoriesHelper
48 include RepositoriesHelper
49 helper :sort
49 helper :sort
50 include SortHelper
50 include SortHelper
51 include IssuesHelper
51 include IssuesHelper
52 helper :timelog
52 helper :timelog
53 include Redmine::Export::PDF
53 include Redmine::Export::PDF
54
54
55 def index
55 def index
56 retrieve_query
56 retrieve_query
57 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
57 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
58 sort_update(@query.sortable_columns)
58 sort_update(@query.sortable_columns)
59 @query.sort_criteria = sort_criteria.to_a
59 @query.sort_criteria = sort_criteria.to_a
60
60
61 if @query.valid?
61 if @query.valid?
62 case params[:format]
62 case params[:format]
63 when 'csv', 'pdf'
63 when 'csv', 'pdf'
64 @limit = Setting.issues_export_limit.to_i
64 @limit = Setting.issues_export_limit.to_i
65 if params[:columns] == 'all'
65 if params[:columns] == 'all'
66 @query.column_names = @query.available_inline_columns.map(&:name)
66 @query.column_names = @query.available_inline_columns.map(&:name)
67 end
67 end
68 when 'atom'
68 when 'atom'
69 @limit = Setting.feeds_limit.to_i
69 @limit = Setting.feeds_limit.to_i
70 when 'xml', 'json'
70 when 'xml', 'json'
71 @offset, @limit = api_offset_and_limit
71 @offset, @limit = api_offset_and_limit
72 @query.column_names = %w(author)
72 @query.column_names = %w(author)
73 else
73 else
74 @limit = per_page_option
74 @limit = per_page_option
75 end
75 end
76
76
77 @issue_count = @query.issue_count
77 @issue_count = @query.issue_count
78 @issue_pages = Paginator.new @issue_count, @limit, params['page']
78 @issue_pages = Paginator.new @issue_count, @limit, params['page']
79 @offset ||= @issue_pages.offset
79 @offset ||= @issue_pages.offset
80 @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
80 @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
81 :order => sort_clause,
81 :order => sort_clause,
82 :offset => @offset,
82 :offset => @offset,
83 :limit => @limit)
83 :limit => @limit)
84 @issue_count_by_group = @query.issue_count_by_group
84 @issue_count_by_group = @query.issue_count_by_group
85
85
86 respond_to do |format|
86 respond_to do |format|
87 format.html { render :template => 'issues/index', :layout => !request.xhr? }
87 format.html { render :template => 'issues/index', :layout => !request.xhr? }
88 format.api {
88 format.api {
89 Issue.load_visible_relations(@issues) if include_in_api_response?('relations')
89 Issue.load_visible_relations(@issues) if include_in_api_response?('relations')
90 }
90 }
91 format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
91 format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
92 format.csv { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') }
92 format.csv { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') }
93 format.pdf { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'issues.pdf') }
93 format.pdf { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'issues.pdf') }
94 end
94 end
95 else
95 else
96 respond_to do |format|
96 respond_to do |format|
97 format.html { render(:template => 'issues/index', :layout => !request.xhr?) }
97 format.html { render(:template => 'issues/index', :layout => !request.xhr?) }
98 format.any(:atom, :csv, :pdf) { render(:nothing => true) }
98 format.any(:atom, :csv, :pdf) { render(:nothing => true) }
99 format.api { render_validation_errors(@query) }
99 format.api { render_validation_errors(@query) }
100 end
100 end
101 end
101 end
102 rescue ActiveRecord::RecordNotFound
102 rescue ActiveRecord::RecordNotFound
103 render_404
103 render_404
104 end
104 end
105
105
106 def show
106 def show
107 @journals = @issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
107 @journals = @issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
108 @journals.each_with_index {|j,i| j.indice = i+1}
108 @journals.each_with_index {|j,i| j.indice = i+1}
109 @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
109 @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
110 Journal.preload_journals_details_custom_fields(@journals)
110 Journal.preload_journals_details_custom_fields(@journals)
111 # TODO: use #select! when ruby1.8 support is dropped
111 # TODO: use #select! when ruby1.8 support is dropped
112 @journals.reject! {|journal| !journal.notes? && journal.visible_details.empty?}
112 @journals.reject! {|journal| !journal.notes? && journal.visible_details.empty?}
113 @journals.reverse! if User.current.wants_comments_in_reverse_order?
113 @journals.reverse! if User.current.wants_comments_in_reverse_order?
114
114
115 @changesets = @issue.changesets.visible.preload(:repository, :user).to_a
115 @changesets = @issue.changesets.visible.preload(:repository, :user).to_a
116 @changesets.reverse! if User.current.wants_comments_in_reverse_order?
116 @changesets.reverse! if User.current.wants_comments_in_reverse_order?
117
117
118 @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
118 @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
119 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
119 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
120 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
120 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
121 @priorities = IssuePriority.active
121 @priorities = IssuePriority.active
122 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
122 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
123 @relation = IssueRelation.new
123 @relation = IssueRelation.new
124
124
125 respond_to do |format|
125 respond_to do |format|
126 format.html {
126 format.html {
127 retrieve_previous_and_next_issue_ids
127 retrieve_previous_and_next_issue_ids
128 render :template => 'issues/show'
128 render :template => 'issues/show'
129 }
129 }
130 format.api
130 format.api
131 format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
131 format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
132 format.pdf {
132 format.pdf {
133 pdf = issue_to_pdf(@issue, :journals => @journals)
133 pdf = issue_to_pdf(@issue, :journals => @journals)
134 send_data(pdf, :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf")
134 send_data(pdf, :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf")
135 }
135 }
136 end
136 end
137 end
137 end
138
138
139 # Add a new issue
139 # Add a new issue
140 # The new issue will be created from an existing one if copy_from parameter is given
140 # The new issue will be created from an existing one if copy_from parameter is given
141 def new
141 def new
142 respond_to do |format|
142 respond_to do |format|
143 format.html { render :action => 'new', :layout => !request.xhr? }
143 format.html { render :action => 'new', :layout => !request.xhr? }
144 end
144 end
145 end
145 end
146
146
147 def create
147 def create
148 call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
148 call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
149 @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
149 @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
150 if @issue.save
150 if @issue.save
151 call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
151 call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
152 respond_to do |format|
152 respond_to do |format|
153 format.html {
153 format.html {
154 render_attachment_warning_if_needed(@issue)
154 render_attachment_warning_if_needed(@issue)
155 flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
155 flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
156 if params[:continue]
156 if params[:continue]
157 attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
157 attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
158 redirect_to new_project_issue_path(@issue.project, :issue => attrs)
158 redirect_to new_project_issue_path(@issue.project, :issue => attrs)
159 else
159 else
160 redirect_to issue_path(@issue)
160 redirect_to issue_path(@issue)
161 end
161 end
162 }
162 }
163 format.api { render :action => 'show', :status => :created, :location => issue_url(@issue) }
163 format.api { render :action => 'show', :status => :created, :location => issue_url(@issue) }
164 end
164 end
165 return
165 return
166 else
166 else
167 respond_to do |format|
167 respond_to do |format|
168 format.html { render :action => 'new' }
168 format.html { render :action => 'new' }
169 format.api { render_validation_errors(@issue) }
169 format.api { render_validation_errors(@issue) }
170 end
170 end
171 end
171 end
172 end
172 end
173
173
174 def edit
174 def edit
175 return unless update_issue_from_params
175 return unless update_issue_from_params
176
176
177 respond_to do |format|
177 respond_to do |format|
178 format.html { }
178 format.html { }
179 format.xml { }
179 format.xml { }
180 end
180 end
181 end
181 end
182
182
183 def update
183 def update
184 return unless update_issue_from_params
184 return unless update_issue_from_params
185 @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
185 @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
186 saved = false
186 saved = false
187 begin
187 begin
188 saved = save_issue_with_child_records
188 saved = save_issue_with_child_records
189 rescue ActiveRecord::StaleObjectError
189 rescue ActiveRecord::StaleObjectError
190 @conflict = true
190 @conflict = true
191 if params[:last_journal_id]
191 if params[:last_journal_id]
192 @conflict_journals = @issue.journals_after(params[:last_journal_id]).all
192 @conflict_journals = @issue.journals_after(params[:last_journal_id]).all
193 @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
193 @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
194 end
194 end
195 end
195 end
196
196
197 if saved
197 if saved
198 render_attachment_warning_if_needed(@issue)
198 render_attachment_warning_if_needed(@issue)
199 flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
199 flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
200
200
201 respond_to do |format|
201 respond_to do |format|
202 format.html { redirect_back_or_default issue_path(@issue) }
202 format.html { redirect_back_or_default issue_path(@issue) }
203 format.api { render_api_ok }
203 format.api { render_api_ok }
204 end
204 end
205 else
205 else
206 respond_to do |format|
206 respond_to do |format|
207 format.html { render :action => 'edit' }
207 format.html { render :action => 'edit' }
208 format.api { render_validation_errors(@issue) }
208 format.api { render_validation_errors(@issue) }
209 end
209 end
210 end
210 end
211 end
211 end
212
212
213 # Updates the issue form when changing the project, status or tracker
213 # Updates the issue form when changing the project, status or tracker
214 # on issue creation/update
214 # on issue creation/update
215 def update_form
215 def update_form
216 end
216 end
217
217
218 # Bulk edit/copy a set of issues
218 # Bulk edit/copy a set of issues
219 def bulk_edit
219 def bulk_edit
220 @issues.sort!
220 @issues.sort!
221 @copy = params[:copy].present?
221 @copy = params[:copy].present?
222 @notes = params[:notes]
222 @notes = params[:notes]
223
223
224 if User.current.allowed_to?(:move_issues, @projects)
224 if User.current.allowed_to?(:move_issues, @projects)
225 @allowed_projects = Issue.allowed_target_projects_on_move
225 @allowed_projects = Issue.allowed_target_projects_on_move
226 if params[:issue]
226 if params[:issue]
227 @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
227 @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
228 if @target_project
228 if @target_project
229 target_projects = [@target_project]
229 target_projects = [@target_project]
230 end
230 end
231 end
231 end
232 end
232 end
233 target_projects ||= @projects
233 target_projects ||= @projects
234
234
235 if @copy
235 if @copy
236 @available_statuses = [IssueStatus.default]
236 @available_statuses = [IssueStatus.default]
237 else
237 else
238 @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
238 @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
239 end
239 end
240 @custom_fields = target_projects.map{|p|p.all_issue_custom_fields.visible}.reduce(:&)
240 @custom_fields = target_projects.map{|p|p.all_issue_custom_fields.visible}.reduce(:&)
241 @assignables = target_projects.map(&:assignable_users).reduce(:&)
241 @assignables = target_projects.map(&:assignable_users).reduce(:&)
242 @trackers = target_projects.map(&:trackers).reduce(:&)
242 @trackers = target_projects.map(&:trackers).reduce(:&)
243 @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
243 @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
244 @categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
244 @categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
245 if @copy
245 if @copy
246 @attachments_present = @issues.detect {|i| i.attachments.any?}.present?
246 @attachments_present = @issues.detect {|i| i.attachments.any?}.present?
247 @subtasks_present = @issues.detect {|i| !i.leaf?}.present?
247 @subtasks_present = @issues.detect {|i| !i.leaf?}.present?
248 end
248 end
249
249
250 @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
250 @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
251
251
252 @issue_params = params[:issue] || {}
252 @issue_params = params[:issue] || {}
253 @issue_params[:custom_field_values] ||= {}
253 @issue_params[:custom_field_values] ||= {}
254 end
254 end
255
255
256 def bulk_update
256 def bulk_update
257 @issues.sort!
257 @issues.sort!
258 @copy = params[:copy].present?
258 @copy = params[:copy].present?
259
259 attributes = parse_params_for_bulk_issue_attributes(params)
260 attributes = parse_params_for_bulk_issue_attributes(params)
261 copy_subtasks = (params[:copy_subtasks] == '1')
262 copy_attachments = (params[:copy_attachments] == '1')
260
263
261 unsaved_issues = []
264 unsaved_issues = []
262 saved_issues = []
265 saved_issues = []
263
266
264 if @copy && params[:copy_subtasks].present?
267 if @copy && copy_subtasks
265 # Descendant issues will be copied with the parent task
268 # Descendant issues will be copied with the parent task
266 # Don't copy them twice
269 # Don't copy them twice
267 @issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}}
270 @issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}}
268 end
271 end
269
272
270 @issues.each do |orig_issue|
273 @issues.each do |orig_issue|
271 orig_issue.reload
274 orig_issue.reload
272 if @copy
275 if @copy
273 issue = orig_issue.copy({},
276 issue = orig_issue.copy({},
274 :attachments => params[:copy_attachments].present?,
277 :attachments => copy_attachments,
275 :subtasks => params[:copy_subtasks].present?
278 :subtasks => copy_subtasks
276 )
279 )
277 else
280 else
278 issue = orig_issue
281 issue = orig_issue
279 end
282 end
280 journal = issue.init_journal(User.current, params[:notes])
283 journal = issue.init_journal(User.current, params[:notes])
281 issue.safe_attributes = attributes
284 issue.safe_attributes = attributes
282 call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
285 call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
283 if issue.save
286 if issue.save
284 saved_issues << issue
287 saved_issues << issue
285 else
288 else
286 unsaved_issues << orig_issue
289 unsaved_issues << orig_issue
287 end
290 end
288 end
291 end
289
292
290 if unsaved_issues.empty?
293 if unsaved_issues.empty?
291 flash[:notice] = l(:notice_successful_update) unless saved_issues.empty?
294 flash[:notice] = l(:notice_successful_update) unless saved_issues.empty?
292 if params[:follow]
295 if params[:follow]
293 if @issues.size == 1 && saved_issues.size == 1
296 if @issues.size == 1 && saved_issues.size == 1
294 redirect_to issue_path(saved_issues.first)
297 redirect_to issue_path(saved_issues.first)
295 elsif saved_issues.map(&:project).uniq.size == 1
298 elsif saved_issues.map(&:project).uniq.size == 1
296 redirect_to project_issues_path(saved_issues.map(&:project).first)
299 redirect_to project_issues_path(saved_issues.map(&:project).first)
297 end
300 end
298 else
301 else
299 redirect_back_or_default _project_issues_path(@project)
302 redirect_back_or_default _project_issues_path(@project)
300 end
303 end
301 else
304 else
302 @saved_issues = @issues
305 @saved_issues = @issues
303 @unsaved_issues = unsaved_issues
306 @unsaved_issues = unsaved_issues
304 @issues = Issue.visible.where(:id => @unsaved_issues.map(&:id)).all
307 @issues = Issue.visible.where(:id => @unsaved_issues.map(&:id)).all
305 bulk_edit
308 bulk_edit
306 render :action => 'bulk_edit'
309 render :action => 'bulk_edit'
307 end
310 end
308 end
311 end
309
312
310 def destroy
313 def destroy
311 @hours = TimeEntry.where(:issue_id => @issues.map(&:id)).sum(:hours).to_f
314 @hours = TimeEntry.where(:issue_id => @issues.map(&:id)).sum(:hours).to_f
312 if @hours > 0
315 if @hours > 0
313 case params[:todo]
316 case params[:todo]
314 when 'destroy'
317 when 'destroy'
315 # nothing to do
318 # nothing to do
316 when 'nullify'
319 when 'nullify'
317 TimeEntry.where(['issue_id IN (?)', @issues]).update_all('issue_id = NULL')
320 TimeEntry.where(['issue_id IN (?)', @issues]).update_all('issue_id = NULL')
318 when 'reassign'
321 when 'reassign'
319 reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
322 reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
320 if reassign_to.nil?
323 if reassign_to.nil?
321 flash.now[:error] = l(:error_issue_not_found_in_project)
324 flash.now[:error] = l(:error_issue_not_found_in_project)
322 return
325 return
323 else
326 else
324 TimeEntry.where(['issue_id IN (?)', @issues]).
327 TimeEntry.where(['issue_id IN (?)', @issues]).
325 update_all("issue_id = #{reassign_to.id}")
328 update_all("issue_id = #{reassign_to.id}")
326 end
329 end
327 else
330 else
328 # display the destroy form if it's a user request
331 # display the destroy form if it's a user request
329 return unless api_request?
332 return unless api_request?
330 end
333 end
331 end
334 end
332 @issues.each do |issue|
335 @issues.each do |issue|
333 begin
336 begin
334 issue.reload.destroy
337 issue.reload.destroy
335 rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists
338 rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists
336 # nothing to do, issue was already deleted (eg. by a parent)
339 # nothing to do, issue was already deleted (eg. by a parent)
337 end
340 end
338 end
341 end
339 respond_to do |format|
342 respond_to do |format|
340 format.html { redirect_back_or_default _project_issues_path(@project) }
343 format.html { redirect_back_or_default _project_issues_path(@project) }
341 format.api { render_api_ok }
344 format.api { render_api_ok }
342 end
345 end
343 end
346 end
344
347
345 private
348 private
346
349
347 def find_project
350 def find_project
348 project_id = params[:project_id] || (params[:issue] && params[:issue][:project_id])
351 project_id = params[:project_id] || (params[:issue] && params[:issue][:project_id])
349 @project = Project.find(project_id)
352 @project = Project.find(project_id)
350 rescue ActiveRecord::RecordNotFound
353 rescue ActiveRecord::RecordNotFound
351 render_404
354 render_404
352 end
355 end
353
356
354 def retrieve_previous_and_next_issue_ids
357 def retrieve_previous_and_next_issue_ids
355 retrieve_query_from_session
358 retrieve_query_from_session
356 if @query
359 if @query
357 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
360 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
358 sort_update(@query.sortable_columns, 'issues_index_sort')
361 sort_update(@query.sortable_columns, 'issues_index_sort')
359 limit = 500
362 limit = 500
360 issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])
363 issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])
361 if (idx = issue_ids.index(@issue.id)) && idx < limit
364 if (idx = issue_ids.index(@issue.id)) && idx < limit
362 if issue_ids.size < 500
365 if issue_ids.size < 500
363 @issue_position = idx + 1
366 @issue_position = idx + 1
364 @issue_count = issue_ids.size
367 @issue_count = issue_ids.size
365 end
368 end
366 @prev_issue_id = issue_ids[idx - 1] if idx > 0
369 @prev_issue_id = issue_ids[idx - 1] if idx > 0
367 @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
370 @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
368 end
371 end
369 end
372 end
370 end
373 end
371
374
372 # Used by #edit and #update to set some common instance variables
375 # Used by #edit and #update to set some common instance variables
373 # from the params
376 # from the params
374 # TODO: Refactor, not everything in here is needed by #edit
377 # TODO: Refactor, not everything in here is needed by #edit
375 def update_issue_from_params
378 def update_issue_from_params
376 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
379 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
377 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
380 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
378 @time_entry.attributes = params[:time_entry]
381 @time_entry.attributes = params[:time_entry]
379
382
380 @issue.init_journal(User.current)
383 @issue.init_journal(User.current)
381
384
382 issue_attributes = params[:issue]
385 issue_attributes = params[:issue]
383 if issue_attributes && params[:conflict_resolution]
386 if issue_attributes && params[:conflict_resolution]
384 case params[:conflict_resolution]
387 case params[:conflict_resolution]
385 when 'overwrite'
388 when 'overwrite'
386 issue_attributes = issue_attributes.dup
389 issue_attributes = issue_attributes.dup
387 issue_attributes.delete(:lock_version)
390 issue_attributes.delete(:lock_version)
388 when 'add_notes'
391 when 'add_notes'
389 issue_attributes = issue_attributes.slice(:notes)
392 issue_attributes = issue_attributes.slice(:notes)
390 when 'cancel'
393 when 'cancel'
391 redirect_to issue_path(@issue)
394 redirect_to issue_path(@issue)
392 return false
395 return false
393 end
396 end
394 end
397 end
395 @issue.safe_attributes = issue_attributes
398 @issue.safe_attributes = issue_attributes
396 @priorities = IssuePriority.active
399 @priorities = IssuePriority.active
397 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
400 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
398 true
401 true
399 end
402 end
400
403
401 # TODO: Refactor, lots of extra code in here
404 # TODO: Refactor, lots of extra code in here
402 # TODO: Changing tracker on an existing issue should not trigger this
405 # TODO: Changing tracker on an existing issue should not trigger this
403 def build_new_issue_from_params
406 def build_new_issue_from_params
404 if params[:id].blank?
407 if params[:id].blank?
405 @issue = Issue.new
408 @issue = Issue.new
406 if params[:copy_from]
409 if params[:copy_from]
407 begin
410 begin
408 @copy_from = Issue.visible.find(params[:copy_from])
411 @copy_from = Issue.visible.find(params[:copy_from])
409 @copy_attachments = params[:copy_attachments].present? || request.get?
412 @copy_attachments = params[:copy_attachments].present? || request.get?
410 @copy_subtasks = params[:copy_subtasks].present? || request.get?
413 @copy_subtasks = params[:copy_subtasks].present? || request.get?
411 @issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks)
414 @issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks)
412 rescue ActiveRecord::RecordNotFound
415 rescue ActiveRecord::RecordNotFound
413 render_404
416 render_404
414 return
417 return
415 end
418 end
416 end
419 end
417 @issue.project = @project
420 @issue.project = @project
418 else
421 else
419 @issue = @project.issues.visible.find(params[:id])
422 @issue = @project.issues.visible.find(params[:id])
420 end
423 end
421
424
422 @issue.project = @project
425 @issue.project = @project
423 @issue.author ||= User.current
426 @issue.author ||= User.current
424 # Tracker must be set before custom field values
427 # Tracker must be set before custom field values
425 @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
428 @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
426 if @issue.tracker.nil?
429 if @issue.tracker.nil?
427 render_error l(:error_no_tracker_in_project)
430 render_error l(:error_no_tracker_in_project)
428 return false
431 return false
429 end
432 end
430 @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date?
433 @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date?
431 @issue.safe_attributes = params[:issue]
434 @issue.safe_attributes = params[:issue]
432
435
433 @priorities = IssuePriority.active
436 @priorities = IssuePriority.active
434 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?)
437 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?)
435 @available_watchers = @issue.watcher_users
438 @available_watchers = @issue.watcher_users
436 if @issue.project.users.count <= 20
439 if @issue.project.users.count <= 20
437 @available_watchers = (@available_watchers + @issue.project.users.sort).uniq
440 @available_watchers = (@available_watchers + @issue.project.users.sort).uniq
438 end
441 end
439 end
442 end
440
443
441 def check_for_default_issue_status
444 def check_for_default_issue_status
442 if IssueStatus.default.nil?
445 if IssueStatus.default.nil?
443 render_error l(:error_no_default_issue_status)
446 render_error l(:error_no_default_issue_status)
444 return false
447 return false
445 end
448 end
446 end
449 end
447
450
448 def parse_params_for_bulk_issue_attributes(params)
451 def parse_params_for_bulk_issue_attributes(params)
449 attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
452 attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
450 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
453 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
451 if custom = attributes[:custom_field_values]
454 if custom = attributes[:custom_field_values]
452 custom.reject! {|k,v| v.blank?}
455 custom.reject! {|k,v| v.blank?}
453 custom.keys.each do |k|
456 custom.keys.each do |k|
454 if custom[k].is_a?(Array)
457 if custom[k].is_a?(Array)
455 custom[k] << '' if custom[k].delete('__none__')
458 custom[k] << '' if custom[k].delete('__none__')
456 else
459 else
457 custom[k] = '' if custom[k] == '__none__'
460 custom[k] = '' if custom[k] == '__none__'
458 end
461 end
459 end
462 end
460 end
463 end
461 attributes
464 attributes
462 end
465 end
463
466
464 # Saves @issue and a time_entry from the parameters
467 # Saves @issue and a time_entry from the parameters
465 def save_issue_with_child_records
468 def save_issue_with_child_records
466 Issue.transaction do
469 Issue.transaction do
467 if params[:time_entry] && (params[:time_entry][:hours].present? || params[:time_entry][:comments].present?) && User.current.allowed_to?(:log_time, @issue.project)
470 if params[:time_entry] && (params[:time_entry][:hours].present? || params[:time_entry][:comments].present?) && User.current.allowed_to?(:log_time, @issue.project)
468 time_entry = @time_entry || TimeEntry.new
471 time_entry = @time_entry || TimeEntry.new
469 time_entry.project = @issue.project
472 time_entry.project = @issue.project
470 time_entry.issue = @issue
473 time_entry.issue = @issue
471 time_entry.user = User.current
474 time_entry.user = User.current
472 time_entry.spent_on = User.current.today
475 time_entry.spent_on = User.current.today
473 time_entry.attributes = params[:time_entry]
476 time_entry.attributes = params[:time_entry]
474 @issue.time_entries << time_entry
477 @issue.time_entries << time_entry
475 end
478 end
476
479
477 call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
480 call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
478 if @issue.save
481 if @issue.save
479 call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
482 call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
480 else
483 else
481 raise ActiveRecord::Rollback
484 raise ActiveRecord::Rollback
482 end
485 end
483 end
486 end
484 end
487 end
485 end
488 end
1 NO CONTENT: modified file
NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
General Comments 0
You need to be logged in to leave comments. Login now