The requested changes are too big and content was truncated. Show full diff
@@ -1,514 +1,517 | |||||
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 :authorize, :except => [:index, :new, :create] |
|
24 | before_filter :authorize, :except => [:index, :new, :create] | |
25 | before_filter :find_optional_project, :only => [:index, :new, :create] |
|
25 | before_filter :find_optional_project, :only => [:index, :new, :create] | |
26 | before_filter :build_new_issue_from_params, :only => [:new, :create] |
|
26 | before_filter :build_new_issue_from_params, :only => [:new, :create] | |
27 | accept_rss_auth :index, :show |
|
27 | accept_rss_auth :index, :show | |
28 | accept_api_auth :index, :show, :create, :update, :destroy |
|
28 | accept_api_auth :index, :show, :create, :update, :destroy | |
29 |
|
29 | |||
30 | rescue_from Query::StatementInvalid, :with => :query_statement_invalid |
|
30 | rescue_from Query::StatementInvalid, :with => :query_statement_invalid | |
31 |
|
31 | |||
32 | helper :journals |
|
32 | helper :journals | |
33 | helper :projects |
|
33 | helper :projects | |
34 | helper :custom_fields |
|
34 | helper :custom_fields | |
35 | helper :issue_relations |
|
35 | helper :issue_relations | |
36 | helper :watchers |
|
36 | helper :watchers | |
37 | helper :attachments |
|
37 | helper :attachments | |
38 | helper :queries |
|
38 | helper :queries | |
39 | include QueriesHelper |
|
39 | include QueriesHelper | |
40 | helper :repositories |
|
40 | helper :repositories | |
41 | helper :sort |
|
41 | helper :sort | |
42 | include SortHelper |
|
42 | include SortHelper | |
43 | helper :timelog |
|
43 | helper :timelog | |
44 |
|
44 | |||
45 | def index |
|
45 | def index | |
46 | retrieve_query |
|
46 | retrieve_query | |
47 | sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria) |
|
47 | sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria) | |
48 | sort_update(@query.sortable_columns) |
|
48 | sort_update(@query.sortable_columns) | |
49 | @query.sort_criteria = sort_criteria.to_a |
|
49 | @query.sort_criteria = sort_criteria.to_a | |
50 |
|
50 | |||
51 | if @query.valid? |
|
51 | if @query.valid? | |
52 | case params[:format] |
|
52 | case params[:format] | |
53 | when 'csv', 'pdf' |
|
53 | when 'csv', 'pdf' | |
54 | @limit = Setting.issues_export_limit.to_i |
|
54 | @limit = Setting.issues_export_limit.to_i | |
55 | if params[:columns] == 'all' |
|
55 | if params[:columns] == 'all' | |
56 | @query.column_names = @query.available_inline_columns.map(&:name) |
|
56 | @query.column_names = @query.available_inline_columns.map(&:name) | |
57 | end |
|
57 | end | |
58 | when 'atom' |
|
58 | when 'atom' | |
59 | @limit = Setting.feeds_limit.to_i |
|
59 | @limit = Setting.feeds_limit.to_i | |
60 | when 'xml', 'json' |
|
60 | when 'xml', 'json' | |
61 | @offset, @limit = api_offset_and_limit |
|
61 | @offset, @limit = api_offset_and_limit | |
62 | @query.column_names = %w(author) |
|
62 | @query.column_names = %w(author) | |
63 | else |
|
63 | else | |
64 | @limit = per_page_option |
|
64 | @limit = per_page_option | |
65 | end |
|
65 | end | |
66 |
|
66 | |||
67 | @issue_count = @query.issue_count |
|
67 | @issue_count = @query.issue_count | |
68 | @issue_pages = Paginator.new @issue_count, @limit, params['page'] |
|
68 | @issue_pages = Paginator.new @issue_count, @limit, params['page'] | |
69 | @offset ||= @issue_pages.offset |
|
69 | @offset ||= @issue_pages.offset | |
70 | @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version], |
|
70 | @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version], | |
71 | :order => sort_clause, |
|
71 | :order => sort_clause, | |
72 | :offset => @offset, |
|
72 | :offset => @offset, | |
73 | :limit => @limit) |
|
73 | :limit => @limit) | |
74 | @issue_count_by_group = @query.issue_count_by_group |
|
74 | @issue_count_by_group = @query.issue_count_by_group | |
75 |
|
75 | |||
76 | respond_to do |format| |
|
76 | respond_to do |format| | |
77 | format.html { render :template => 'issues/index', :layout => !request.xhr? } |
|
77 | format.html { render :template => 'issues/index', :layout => !request.xhr? } | |
78 | format.api { |
|
78 | format.api { | |
79 | Issue.load_visible_relations(@issues) if include_in_api_response?('relations') |
|
79 | Issue.load_visible_relations(@issues) if include_in_api_response?('relations') | |
80 | } |
|
80 | } | |
81 | format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") } |
|
81 | format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") } | |
82 | format.csv { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') } |
|
82 | format.csv { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') } | |
83 | format.pdf { send_file_headers! :type => 'application/pdf', :filename => 'issues.pdf' } |
|
83 | format.pdf { send_file_headers! :type => 'application/pdf', :filename => 'issues.pdf' } | |
84 | end |
|
84 | end | |
85 | else |
|
85 | else | |
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.any(:atom, :csv, :pdf) { render(:nothing => true) } |
|
88 | format.any(:atom, :csv, :pdf) { render(:nothing => true) } | |
89 | format.api { render_validation_errors(@query) } |
|
89 | format.api { render_validation_errors(@query) } | |
90 | end |
|
90 | end | |
91 | end |
|
91 | end | |
92 | rescue ActiveRecord::RecordNotFound |
|
92 | rescue ActiveRecord::RecordNotFound | |
93 | render_404 |
|
93 | render_404 | |
94 | end |
|
94 | end | |
95 |
|
95 | |||
96 | def show |
|
96 | def show | |
97 | @journals = @issue.journals.includes(:user, :details). |
|
97 | @journals = @issue.journals.includes(:user, :details). | |
98 | references(:user, :details). |
|
98 | references(:user, :details). | |
99 | reorder("#{Journal.table_name}.id ASC").to_a |
|
99 | reorder("#{Journal.table_name}.id ASC").to_a | |
100 | @journals.each_with_index {|j,i| j.indice = i+1} |
|
100 | @journals.each_with_index {|j,i| j.indice = i+1} | |
101 | @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project) |
|
101 | @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project) | |
102 | Journal.preload_journals_details_custom_fields(@journals) |
|
102 | Journal.preload_journals_details_custom_fields(@journals) | |
103 | @journals.select! {|journal| journal.notes? || journal.visible_details.any?} |
|
103 | @journals.select! {|journal| journal.notes? || journal.visible_details.any?} | |
104 | @journals.reverse! if User.current.wants_comments_in_reverse_order? |
|
104 | @journals.reverse! if User.current.wants_comments_in_reverse_order? | |
105 |
|
105 | |||
106 | @changesets = @issue.changesets.visible.preload(:repository, :user).to_a |
|
106 | @changesets = @issue.changesets.visible.preload(:repository, :user).to_a | |
107 | @changesets.reverse! if User.current.wants_comments_in_reverse_order? |
|
107 | @changesets.reverse! if User.current.wants_comments_in_reverse_order? | |
108 |
|
108 | |||
109 | @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? } |
|
109 | @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? } | |
110 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current) |
|
110 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current) | |
111 | @priorities = IssuePriority.active |
|
111 | @priorities = IssuePriority.active | |
112 | @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project) |
|
112 | @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project) | |
113 | @relation = IssueRelation.new |
|
113 | @relation = IssueRelation.new | |
114 |
|
114 | |||
115 | respond_to do |format| |
|
115 | respond_to do |format| | |
116 | format.html { |
|
116 | format.html { | |
117 | retrieve_previous_and_next_issue_ids |
|
117 | retrieve_previous_and_next_issue_ids | |
118 | render :template => 'issues/show' |
|
118 | render :template => 'issues/show' | |
119 | } |
|
119 | } | |
120 | format.api |
|
120 | format.api | |
121 | format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' } |
|
121 | format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' } | |
122 | format.pdf { |
|
122 | format.pdf { | |
123 | send_file_headers! :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf" |
|
123 | send_file_headers! :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf" | |
124 | } |
|
124 | } | |
125 | end |
|
125 | end | |
126 | end |
|
126 | end | |
127 |
|
127 | |||
128 | def new |
|
128 | def new | |
129 | respond_to do |format| |
|
129 | respond_to do |format| | |
130 | format.html { render :action => 'new', :layout => !request.xhr? } |
|
130 | format.html { render :action => 'new', :layout => !request.xhr? } | |
131 | format.js |
|
131 | format.js | |
132 | end |
|
132 | end | |
133 | end |
|
133 | end | |
134 |
|
134 | |||
135 | def create |
|
135 | def create | |
136 | unless User.current.allowed_to?(:add_issues, @issue.project, :global => true) |
|
136 | unless User.current.allowed_to?(:add_issues, @issue.project, :global => true) | |
137 | raise ::Unauthorized |
|
137 | raise ::Unauthorized | |
138 | end |
|
138 | end | |
139 | call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue }) |
|
139 | call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue }) | |
140 | @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads])) |
|
140 | @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads])) | |
141 | if @issue.save |
|
141 | if @issue.save | |
142 | call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue}) |
|
142 | call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue}) | |
143 | respond_to do |format| |
|
143 | respond_to do |format| | |
144 | format.html { |
|
144 | format.html { | |
145 | render_attachment_warning_if_needed(@issue) |
|
145 | render_attachment_warning_if_needed(@issue) | |
146 | flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject)) |
|
146 | flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject)) | |
147 | redirect_after_create |
|
147 | redirect_after_create | |
148 | } |
|
148 | } | |
149 | format.api { render :action => 'show', :status => :created, :location => issue_url(@issue) } |
|
149 | format.api { render :action => 'show', :status => :created, :location => issue_url(@issue) } | |
150 | end |
|
150 | end | |
151 | return |
|
151 | return | |
152 | else |
|
152 | else | |
153 | respond_to do |format| |
|
153 | respond_to do |format| | |
154 | format.html { |
|
154 | format.html { | |
155 | if @issue.project.nil? |
|
155 | if @issue.project.nil? | |
156 | render_error :status => 422 |
|
156 | render_error :status => 422 | |
157 | else |
|
157 | else | |
158 | render :action => 'new' |
|
158 | render :action => 'new' | |
159 | end |
|
159 | end | |
160 | } |
|
160 | } | |
161 | format.api { render_validation_errors(@issue) } |
|
161 | format.api { render_validation_errors(@issue) } | |
162 | end |
|
162 | end | |
163 | end |
|
163 | end | |
164 | end |
|
164 | end | |
165 |
|
165 | |||
166 | def edit |
|
166 | def edit | |
167 | return unless update_issue_from_params |
|
167 | return unless update_issue_from_params | |
168 |
|
168 | |||
169 | respond_to do |format| |
|
169 | respond_to do |format| | |
170 | format.html { } |
|
170 | format.html { } | |
171 | format.js |
|
171 | format.js | |
172 | end |
|
172 | end | |
173 | end |
|
173 | end | |
174 |
|
174 | |||
175 | def update |
|
175 | def update | |
176 | return unless update_issue_from_params |
|
176 | return unless update_issue_from_params | |
177 | @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads])) |
|
177 | @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads])) | |
178 | saved = false |
|
178 | saved = false | |
179 | begin |
|
179 | begin | |
180 | saved = save_issue_with_child_records |
|
180 | saved = save_issue_with_child_records | |
181 | rescue ActiveRecord::StaleObjectError |
|
181 | rescue ActiveRecord::StaleObjectError | |
182 | @conflict = true |
|
182 | @conflict = true | |
183 | if params[:last_journal_id] |
|
183 | if params[:last_journal_id] | |
184 | @conflict_journals = @issue.journals_after(params[:last_journal_id]).to_a |
|
184 | @conflict_journals = @issue.journals_after(params[:last_journal_id]).to_a | |
185 | @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project) |
|
185 | @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project) | |
186 | end |
|
186 | end | |
187 | end |
|
187 | end | |
188 |
|
188 | |||
189 | if saved |
|
189 | if saved | |
190 | render_attachment_warning_if_needed(@issue) |
|
190 | render_attachment_warning_if_needed(@issue) | |
191 | flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record? |
|
191 | flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record? | |
192 |
|
192 | |||
193 | respond_to do |format| |
|
193 | respond_to do |format| | |
194 | format.html { redirect_back_or_default issue_path(@issue) } |
|
194 | format.html { redirect_back_or_default issue_path(@issue) } | |
195 | format.api { render_api_ok } |
|
195 | format.api { render_api_ok } | |
196 | end |
|
196 | end | |
197 | else |
|
197 | else | |
198 | respond_to do |format| |
|
198 | respond_to do |format| | |
199 | format.html { render :action => 'edit' } |
|
199 | format.html { render :action => 'edit' } | |
200 | format.api { render_validation_errors(@issue) } |
|
200 | format.api { render_validation_errors(@issue) } | |
201 | end |
|
201 | end | |
202 | end |
|
202 | end | |
203 | end |
|
203 | end | |
204 |
|
204 | |||
205 | # Bulk edit/copy a set of issues |
|
205 | # Bulk edit/copy a set of issues | |
206 | def bulk_edit |
|
206 | def bulk_edit | |
207 | @issues.sort! |
|
207 | @issues.sort! | |
208 | @copy = params[:copy].present? |
|
208 | @copy = params[:copy].present? | |
209 | @notes = params[:notes] |
|
209 | @notes = params[:notes] | |
210 |
|
210 | |||
211 | if @copy |
|
211 | if @copy | |
212 | unless User.current.allowed_to?(:copy_issues, @projects) |
|
212 | unless User.current.allowed_to?(:copy_issues, @projects) | |
213 | raise ::Unauthorized |
|
213 | raise ::Unauthorized | |
214 | end |
|
214 | end | |
215 | end |
|
215 | end | |
216 |
|
216 | |||
217 | @allowed_projects = Issue.allowed_target_projects |
|
217 | @allowed_projects = Issue.allowed_target_projects | |
218 | if params[:issue] |
|
218 | if params[:issue] | |
219 | @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s} |
|
219 | @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s} | |
220 | if @target_project |
|
220 | if @target_project | |
221 | target_projects = [@target_project] |
|
221 | target_projects = [@target_project] | |
222 | end |
|
222 | end | |
223 | end |
|
223 | end | |
224 | target_projects ||= @projects |
|
224 | target_projects ||= @projects | |
225 |
|
225 | |||
226 | if @copy |
|
226 | if @copy | |
227 | # Copied issues will get their default statuses |
|
227 | # Copied issues will get their default statuses | |
228 | @available_statuses = [] |
|
228 | @available_statuses = [] | |
229 | else |
|
229 | else | |
230 | @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&) |
|
230 | @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&) | |
231 | end |
|
231 | end | |
232 | @custom_fields = @issues.map{|i|i.editable_custom_fields}.reduce(:&) |
|
232 | @custom_fields = @issues.map{|i|i.editable_custom_fields}.reduce(:&) | |
233 | @assignables = target_projects.map(&:assignable_users).reduce(:&) |
|
233 | @assignables = target_projects.map(&:assignable_users).reduce(:&) | |
234 | @trackers = target_projects.map(&:trackers).reduce(:&) |
|
234 | @trackers = target_projects.map(&:trackers).reduce(:&) | |
235 | @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&) |
|
235 | @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&) | |
236 | @categories = target_projects.map {|p| p.issue_categories}.reduce(:&) |
|
236 | @categories = target_projects.map {|p| p.issue_categories}.reduce(:&) | |
237 | if @copy |
|
237 | if @copy | |
238 | @attachments_present = @issues.detect {|i| i.attachments.any?}.present? |
|
238 | @attachments_present = @issues.detect {|i| i.attachments.any?}.present? | |
239 | @subtasks_present = @issues.detect {|i| !i.leaf?}.present? |
|
239 | @subtasks_present = @issues.detect {|i| !i.leaf?}.present? | |
240 | end |
|
240 | end | |
241 |
|
241 | |||
242 | @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&) |
|
242 | @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&) | |
243 |
|
243 | |||
244 | @issue_params = params[:issue] || {} |
|
244 | @issue_params = params[:issue] || {} | |
245 | @issue_params[:custom_field_values] ||= {} |
|
245 | @issue_params[:custom_field_values] ||= {} | |
246 | end |
|
246 | end | |
247 |
|
247 | |||
248 | def bulk_update |
|
248 | def bulk_update | |
249 | @issues.sort! |
|
249 | @issues.sort! | |
250 | @copy = params[:copy].present? |
|
250 | @copy = params[:copy].present? | |
|
251 | ||||
251 | attributes = parse_params_for_bulk_issue_attributes(params) |
|
252 | attributes = parse_params_for_bulk_issue_attributes(params) | |
|
253 | copy_subtasks = (params[:copy_subtasks] == '1') | |||
|
254 | copy_attachments = (params[:copy_attachments] == '1') | |||
252 |
|
255 | |||
253 | if @copy |
|
256 | if @copy | |
254 | unless User.current.allowed_to?(:copy_issues, @projects) |
|
257 | unless User.current.allowed_to?(:copy_issues, @projects) | |
255 | raise ::Unauthorized |
|
258 | raise ::Unauthorized | |
256 | end |
|
259 | end | |
257 | target_projects = @projects |
|
260 | target_projects = @projects | |
258 | if attributes['project_id'].present? |
|
261 | if attributes['project_id'].present? | |
259 | target_projects = Project.where(:id => attributes['project_id']).to_a |
|
262 | target_projects = Project.where(:id => attributes['project_id']).to_a | |
260 | end |
|
263 | end | |
261 | unless User.current.allowed_to?(:add_issues, target_projects) |
|
264 | unless User.current.allowed_to?(:add_issues, target_projects) | |
262 | raise ::Unauthorized |
|
265 | raise ::Unauthorized | |
263 | end |
|
266 | end | |
264 | end |
|
267 | end | |
265 |
|
268 | |||
266 | unsaved_issues = [] |
|
269 | unsaved_issues = [] | |
267 | saved_issues = [] |
|
270 | saved_issues = [] | |
268 |
|
271 | |||
269 |
if @copy && |
|
272 | if @copy && copy_subtasks | |
270 | # Descendant issues will be copied with the parent task |
|
273 | # Descendant issues will be copied with the parent task | |
271 | # Don't copy them twice |
|
274 | # Don't copy them twice | |
272 | @issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}} |
|
275 | @issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}} | |
273 | end |
|
276 | end | |
274 |
|
277 | |||
275 | @issues.each do |orig_issue| |
|
278 | @issues.each do |orig_issue| | |
276 | orig_issue.reload |
|
279 | orig_issue.reload | |
277 | if @copy |
|
280 | if @copy | |
278 | issue = orig_issue.copy({}, |
|
281 | issue = orig_issue.copy({}, | |
279 |
:attachments => |
|
282 | :attachments => copy_attachments, | |
280 |
:subtasks => |
|
283 | :subtasks => copy_subtasks, | |
281 | :link => link_copy?(params[:link_copy]) |
|
284 | :link => link_copy?(params[:link_copy]) | |
282 | ) |
|
285 | ) | |
283 | else |
|
286 | else | |
284 | issue = orig_issue |
|
287 | issue = orig_issue | |
285 | end |
|
288 | end | |
286 | journal = issue.init_journal(User.current, params[:notes]) |
|
289 | journal = issue.init_journal(User.current, params[:notes]) | |
287 | issue.safe_attributes = attributes |
|
290 | issue.safe_attributes = attributes | |
288 | call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue }) |
|
291 | call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue }) | |
289 | if issue.save |
|
292 | if issue.save | |
290 | saved_issues << issue |
|
293 | saved_issues << issue | |
291 | else |
|
294 | else | |
292 | unsaved_issues << orig_issue |
|
295 | unsaved_issues << orig_issue | |
293 | end |
|
296 | end | |
294 | end |
|
297 | end | |
295 |
|
298 | |||
296 | if unsaved_issues.empty? |
|
299 | if unsaved_issues.empty? | |
297 | flash[:notice] = l(:notice_successful_update) unless saved_issues.empty? |
|
300 | flash[:notice] = l(:notice_successful_update) unless saved_issues.empty? | |
298 | if params[:follow] |
|
301 | if params[:follow] | |
299 | if @issues.size == 1 && saved_issues.size == 1 |
|
302 | if @issues.size == 1 && saved_issues.size == 1 | |
300 | redirect_to issue_path(saved_issues.first) |
|
303 | redirect_to issue_path(saved_issues.first) | |
301 | elsif saved_issues.map(&:project).uniq.size == 1 |
|
304 | elsif saved_issues.map(&:project).uniq.size == 1 | |
302 | redirect_to project_issues_path(saved_issues.map(&:project).first) |
|
305 | redirect_to project_issues_path(saved_issues.map(&:project).first) | |
303 | end |
|
306 | end | |
304 | else |
|
307 | else | |
305 | redirect_back_or_default _project_issues_path(@project) |
|
308 | redirect_back_or_default _project_issues_path(@project) | |
306 | end |
|
309 | end | |
307 | else |
|
310 | else | |
308 | @saved_issues = @issues |
|
311 | @saved_issues = @issues | |
309 | @unsaved_issues = unsaved_issues |
|
312 | @unsaved_issues = unsaved_issues | |
310 | @issues = Issue.visible.where(:id => @unsaved_issues.map(&:id)).to_a |
|
313 | @issues = Issue.visible.where(:id => @unsaved_issues.map(&:id)).to_a | |
311 | bulk_edit |
|
314 | bulk_edit | |
312 | render :action => 'bulk_edit' |
|
315 | render :action => 'bulk_edit' | |
313 | end |
|
316 | end | |
314 | end |
|
317 | end | |
315 |
|
318 | |||
316 | def destroy |
|
319 | def destroy | |
317 | @hours = TimeEntry.where(:issue_id => @issues.map(&:id)).sum(:hours).to_f |
|
320 | @hours = TimeEntry.where(:issue_id => @issues.map(&:id)).sum(:hours).to_f | |
318 | if @hours > 0 |
|
321 | if @hours > 0 | |
319 | case params[:todo] |
|
322 | case params[:todo] | |
320 | when 'destroy' |
|
323 | when 'destroy' | |
321 | # nothing to do |
|
324 | # nothing to do | |
322 | when 'nullify' |
|
325 | when 'nullify' | |
323 | TimeEntry.where(['issue_id IN (?)', @issues]).update_all('issue_id = NULL') |
|
326 | TimeEntry.where(['issue_id IN (?)', @issues]).update_all('issue_id = NULL') | |
324 | when 'reassign' |
|
327 | when 'reassign' | |
325 | reassign_to = @project.issues.find_by_id(params[:reassign_to_id]) |
|
328 | reassign_to = @project.issues.find_by_id(params[:reassign_to_id]) | |
326 | if reassign_to.nil? |
|
329 | if reassign_to.nil? | |
327 | flash.now[:error] = l(:error_issue_not_found_in_project) |
|
330 | flash.now[:error] = l(:error_issue_not_found_in_project) | |
328 | return |
|
331 | return | |
329 | else |
|
332 | else | |
330 | TimeEntry.where(['issue_id IN (?)', @issues]). |
|
333 | TimeEntry.where(['issue_id IN (?)', @issues]). | |
331 | update_all("issue_id = #{reassign_to.id}") |
|
334 | update_all("issue_id = #{reassign_to.id}") | |
332 | end |
|
335 | end | |
333 | else |
|
336 | else | |
334 | # display the destroy form if it's a user request |
|
337 | # display the destroy form if it's a user request | |
335 | return unless api_request? |
|
338 | return unless api_request? | |
336 | end |
|
339 | end | |
337 | end |
|
340 | end | |
338 | @issues.each do |issue| |
|
341 | @issues.each do |issue| | |
339 | begin |
|
342 | begin | |
340 | issue.reload.destroy |
|
343 | issue.reload.destroy | |
341 | rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists |
|
344 | rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists | |
342 | # nothing to do, issue was already deleted (eg. by a parent) |
|
345 | # nothing to do, issue was already deleted (eg. by a parent) | |
343 | end |
|
346 | end | |
344 | end |
|
347 | end | |
345 | respond_to do |format| |
|
348 | respond_to do |format| | |
346 | format.html { redirect_back_or_default _project_issues_path(@project) } |
|
349 | format.html { redirect_back_or_default _project_issues_path(@project) } | |
347 | format.api { render_api_ok } |
|
350 | format.api { render_api_ok } | |
348 | end |
|
351 | end | |
349 | end |
|
352 | end | |
350 |
|
353 | |||
351 | private |
|
354 | private | |
352 |
|
355 | |||
353 | def retrieve_previous_and_next_issue_ids |
|
356 | def retrieve_previous_and_next_issue_ids | |
354 | retrieve_query_from_session |
|
357 | retrieve_query_from_session | |
355 | if @query |
|
358 | if @query | |
356 | sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria) |
|
359 | sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria) | |
357 | sort_update(@query.sortable_columns, 'issues_index_sort') |
|
360 | sort_update(@query.sortable_columns, 'issues_index_sort') | |
358 | limit = 500 |
|
361 | limit = 500 | |
359 | issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version]) |
|
362 | issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version]) | |
360 | if (idx = issue_ids.index(@issue.id)) && idx < limit |
|
363 | if (idx = issue_ids.index(@issue.id)) && idx < limit | |
361 | if issue_ids.size < 500 |
|
364 | if issue_ids.size < 500 | |
362 | @issue_position = idx + 1 |
|
365 | @issue_position = idx + 1 | |
363 | @issue_count = issue_ids.size |
|
366 | @issue_count = issue_ids.size | |
364 | end |
|
367 | end | |
365 | @prev_issue_id = issue_ids[idx - 1] if idx > 0 |
|
368 | @prev_issue_id = issue_ids[idx - 1] if idx > 0 | |
366 | @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1) |
|
369 | @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1) | |
367 | end |
|
370 | end | |
368 | end |
|
371 | end | |
369 | end |
|
372 | end | |
370 |
|
373 | |||
371 | # Used by #edit and #update to set some common instance variables |
|
374 | # Used by #edit and #update to set some common instance variables | |
372 | # from the params |
|
375 | # from the params | |
373 | def update_issue_from_params |
|
376 | def update_issue_from_params | |
374 | @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project) |
|
377 | @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project) | |
375 | if params[:time_entry] |
|
378 | if params[:time_entry] | |
376 | @time_entry.attributes = params[:time_entry] |
|
379 | @time_entry.attributes = params[:time_entry] | |
377 | end |
|
380 | end | |
378 |
|
381 | |||
379 | @issue.init_journal(User.current) |
|
382 | @issue.init_journal(User.current) | |
380 |
|
383 | |||
381 | issue_attributes = params[:issue] |
|
384 | issue_attributes = params[:issue] | |
382 | if issue_attributes && params[:conflict_resolution] |
|
385 | if issue_attributes && params[:conflict_resolution] | |
383 | case params[:conflict_resolution] |
|
386 | case params[:conflict_resolution] | |
384 | when 'overwrite' |
|
387 | when 'overwrite' | |
385 | issue_attributes = issue_attributes.dup |
|
388 | issue_attributes = issue_attributes.dup | |
386 | issue_attributes.delete(:lock_version) |
|
389 | issue_attributes.delete(:lock_version) | |
387 | when 'add_notes' |
|
390 | when 'add_notes' | |
388 | issue_attributes = issue_attributes.slice(:notes) |
|
391 | issue_attributes = issue_attributes.slice(:notes) | |
389 | when 'cancel' |
|
392 | when 'cancel' | |
390 | redirect_to issue_path(@issue) |
|
393 | redirect_to issue_path(@issue) | |
391 | return false |
|
394 | return false | |
392 | end |
|
395 | end | |
393 | end |
|
396 | end | |
394 | @issue.safe_attributes = issue_attributes |
|
397 | @issue.safe_attributes = issue_attributes | |
395 | @priorities = IssuePriority.active |
|
398 | @priorities = IssuePriority.active | |
396 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current) |
|
399 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current) | |
397 | true |
|
400 | true | |
398 | end |
|
401 | end | |
399 |
|
402 | |||
400 | # Used by #new and #create to build a new issue from the params |
|
403 | # Used by #new and #create to build a new issue from the params | |
401 | # The new issue will be copied from an existing one if copy_from parameter is given |
|
404 | # The new issue will be copied from an existing one if copy_from parameter is given | |
402 | def build_new_issue_from_params |
|
405 | def build_new_issue_from_params | |
403 | @issue = Issue.new |
|
406 | @issue = Issue.new | |
404 | if params[:copy_from] |
|
407 | if params[:copy_from] | |
405 | begin |
|
408 | begin | |
406 | @issue.init_journal(User.current) |
|
409 | @issue.init_journal(User.current) | |
407 | @copy_from = Issue.visible.find(params[:copy_from]) |
|
410 | @copy_from = Issue.visible.find(params[:copy_from]) | |
408 | unless User.current.allowed_to?(:copy_issues, @copy_from.project) |
|
411 | unless User.current.allowed_to?(:copy_issues, @copy_from.project) | |
409 | raise ::Unauthorized |
|
412 | raise ::Unauthorized | |
410 | end |
|
413 | end | |
411 | @link_copy = link_copy?(params[:link_copy]) || request.get? |
|
414 | @link_copy = link_copy?(params[:link_copy]) || request.get? | |
412 | @copy_attachments = params[:copy_attachments].present? || request.get? |
|
415 | @copy_attachments = params[:copy_attachments].present? || request.get? | |
413 | @copy_subtasks = params[:copy_subtasks].present? || request.get? |
|
416 | @copy_subtasks = params[:copy_subtasks].present? || request.get? | |
414 | @issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks, :link => @link_copy) |
|
417 | @issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks, :link => @link_copy) | |
415 | rescue ActiveRecord::RecordNotFound |
|
418 | rescue ActiveRecord::RecordNotFound | |
416 | render_404 |
|
419 | render_404 | |
417 | return |
|
420 | return | |
418 | end |
|
421 | end | |
419 | end |
|
422 | end | |
420 | @issue.project = @project |
|
423 | @issue.project = @project | |
421 | if request.get? |
|
424 | if request.get? | |
422 | @issue.project ||= @issue.allowed_target_projects.first |
|
425 | @issue.project ||= @issue.allowed_target_projects.first | |
423 | end |
|
426 | end | |
424 | @issue.author ||= User.current |
|
427 | @issue.author ||= User.current | |
425 | @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date? |
|
428 | @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date? | |
426 |
|
429 | |||
427 | if attrs = params[:issue].deep_dup |
|
430 | if attrs = params[:issue].deep_dup | |
428 | if action_name == 'new' && params[:was_default_status] == attrs[:status_id] |
|
431 | if action_name == 'new' && params[:was_default_status] == attrs[:status_id] | |
429 | attrs.delete(:status_id) |
|
432 | attrs.delete(:status_id) | |
430 | end |
|
433 | end | |
431 | @issue.safe_attributes = attrs |
|
434 | @issue.safe_attributes = attrs | |
432 | end |
|
435 | end | |
433 | if @issue.project |
|
436 | if @issue.project | |
434 | @issue.tracker ||= @issue.project.trackers.first |
|
437 | @issue.tracker ||= @issue.project.trackers.first | |
435 | if @issue.tracker.nil? |
|
438 | if @issue.tracker.nil? | |
436 | render_error l(:error_no_tracker_in_project) |
|
439 | render_error l(:error_no_tracker_in_project) | |
437 | return false |
|
440 | return false | |
438 | end |
|
441 | end | |
439 | if @issue.status.nil? |
|
442 | if @issue.status.nil? | |
440 | render_error l(:error_no_default_issue_status) |
|
443 | render_error l(:error_no_default_issue_status) | |
441 | return false |
|
444 | return false | |
442 | end |
|
445 | end | |
443 | end |
|
446 | end | |
444 |
|
447 | |||
445 | @priorities = IssuePriority.active |
|
448 | @priorities = IssuePriority.active | |
446 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?) |
|
449 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?) | |
447 | end |
|
450 | end | |
448 |
|
451 | |||
449 | def parse_params_for_bulk_issue_attributes(params) |
|
452 | def parse_params_for_bulk_issue_attributes(params) | |
450 | attributes = (params[:issue] || {}).reject {|k,v| v.blank?} |
|
453 | attributes = (params[:issue] || {}).reject {|k,v| v.blank?} | |
451 | attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'} |
|
454 | attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'} | |
452 | if custom = attributes[:custom_field_values] |
|
455 | if custom = attributes[:custom_field_values] | |
453 | custom.reject! {|k,v| v.blank?} |
|
456 | custom.reject! {|k,v| v.blank?} | |
454 | custom.keys.each do |k| |
|
457 | custom.keys.each do |k| | |
455 | if custom[k].is_a?(Array) |
|
458 | if custom[k].is_a?(Array) | |
456 | custom[k] << '' if custom[k].delete('__none__') |
|
459 | custom[k] << '' if custom[k].delete('__none__') | |
457 | else |
|
460 | else | |
458 | custom[k] = '' if custom[k] == '__none__' |
|
461 | custom[k] = '' if custom[k] == '__none__' | |
459 | end |
|
462 | end | |
460 | end |
|
463 | end | |
461 | end |
|
464 | end | |
462 | attributes |
|
465 | attributes | |
463 | end |
|
466 | end | |
464 |
|
467 | |||
465 | # Saves @issue and a time_entry from the parameters |
|
468 | # Saves @issue and a time_entry from the parameters | |
466 | def save_issue_with_child_records |
|
469 | def save_issue_with_child_records | |
467 | Issue.transaction do |
|
470 | Issue.transaction do | |
468 | if params[:time_entry] && (params[:time_entry][:hours].present? || params[:time_entry][:comments].present?) && User.current.allowed_to?(:log_time, @issue.project) |
|
471 | if params[:time_entry] && (params[:time_entry][:hours].present? || params[:time_entry][:comments].present?) && User.current.allowed_to?(:log_time, @issue.project) | |
469 | time_entry = @time_entry || TimeEntry.new |
|
472 | time_entry = @time_entry || TimeEntry.new | |
470 | time_entry.project = @issue.project |
|
473 | time_entry.project = @issue.project | |
471 | time_entry.issue = @issue |
|
474 | time_entry.issue = @issue | |
472 | time_entry.user = User.current |
|
475 | time_entry.user = User.current | |
473 | time_entry.spent_on = User.current.today |
|
476 | time_entry.spent_on = User.current.today | |
474 | time_entry.attributes = params[:time_entry] |
|
477 | time_entry.attributes = params[:time_entry] | |
475 | @issue.time_entries << time_entry |
|
478 | @issue.time_entries << time_entry | |
476 | end |
|
479 | end | |
477 |
|
480 | |||
478 | call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal}) |
|
481 | call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal}) | |
479 | if @issue.save |
|
482 | if @issue.save | |
480 | call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal}) |
|
483 | call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal}) | |
481 | else |
|
484 | else | |
482 | raise ActiveRecord::Rollback |
|
485 | raise ActiveRecord::Rollback | |
483 | end |
|
486 | end | |
484 | end |
|
487 | end | |
485 | end |
|
488 | end | |
486 |
|
489 | |||
487 | # Returns true if the issue copy should be linked |
|
490 | # Returns true if the issue copy should be linked | |
488 | # to the original issue |
|
491 | # to the original issue | |
489 | def link_copy?(param) |
|
492 | def link_copy?(param) | |
490 | case Setting.link_copied_issue |
|
493 | case Setting.link_copied_issue | |
491 | when 'yes' |
|
494 | when 'yes' | |
492 | true |
|
495 | true | |
493 | when 'no' |
|
496 | when 'no' | |
494 | false |
|
497 | false | |
495 | when 'ask' |
|
498 | when 'ask' | |
496 | param == '1' |
|
499 | param == '1' | |
497 | end |
|
500 | end | |
498 | end |
|
501 | end | |
499 |
|
502 | |||
500 | # Redirects user after a successful issue creation |
|
503 | # Redirects user after a successful issue creation | |
501 | def redirect_after_create |
|
504 | def redirect_after_create | |
502 | if params[:continue] |
|
505 | if params[:continue] | |
503 | attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} |
|
506 | attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} | |
504 | if params[:project_id] |
|
507 | if params[:project_id] | |
505 | redirect_to new_project_issue_path(@issue.project, :issue => attrs) |
|
508 | redirect_to new_project_issue_path(@issue.project, :issue => attrs) | |
506 | else |
|
509 | else | |
507 | attrs.merge! :project_id => @issue.project_id |
|
510 | attrs.merge! :project_id => @issue.project_id | |
508 | redirect_to new_issue_path(:issue => attrs) |
|
511 | redirect_to new_issue_path(:issue => attrs) | |
509 | end |
|
512 | end | |
510 | else |
|
513 | else | |
511 | redirect_to issue_path(@issue) |
|
514 | redirect_to issue_path(@issue) | |
512 | end |
|
515 | end | |
513 | end |
|
516 | end | |
514 | end |
|
517 | 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