##// END OF EJS Templates
jro_apps » redmine
RSS
Previous/next links may be lost after editing the issue (#14462)....
Jean-Philippe Lang -
r14871:17ea1539ef03
parent child
Show More
Side by Side Unified
Context file:
r14871:17ea1539ef03 Loading diff...:

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

Show file before | Show file after | Hide comments
@@ -1,523 +1,539
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2016 Jean-Philippe Lang
2 # Copyright (C) 2006-2016 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[:csv]), :type => 'text/csv; header=present', :filename => 'issues.csv') }
82 format.csv { send_data(query_to_csv(@issues, @query, params[:csv]), :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(:created_on, :id).to_a
99 reorder(:created_on, :id).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, previous_and_next_issue_ids_params) }
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
252 attributes = parse_params_for_bulk_issue_attributes(params)
252 attributes = parse_params_for_bulk_issue_attributes(params)
253 copy_subtasks = (params[:copy_subtasks] == '1')
253 copy_subtasks = (params[:copy_subtasks] == '1')
254 copy_attachments = (params[:copy_attachments] == '1')
254 copy_attachments = (params[:copy_attachments] == '1')
255
255
256 if @copy
256 if @copy
257 unless User.current.allowed_to?(:copy_issues, @projects)
257 unless User.current.allowed_to?(:copy_issues, @projects)
258 raise ::Unauthorized
258 raise ::Unauthorized
259 end
259 end
260 target_projects = @projects
260 target_projects = @projects
261 if attributes['project_id'].present?
261 if attributes['project_id'].present?
262 target_projects = Project.where(:id => attributes['project_id']).to_a
262 target_projects = Project.where(:id => attributes['project_id']).to_a
263 end
263 end
264 unless User.current.allowed_to?(:add_issues, target_projects)
264 unless User.current.allowed_to?(:add_issues, target_projects)
265 raise ::Unauthorized
265 raise ::Unauthorized
266 end
266 end
267 end
267 end
268
268
269 unsaved_issues = []
269 unsaved_issues = []
270 saved_issues = []
270 saved_issues = []
271
271
272 if @copy && copy_subtasks
272 if @copy && copy_subtasks
273 # Descendant issues will be copied with the parent task
273 # Descendant issues will be copied with the parent task
274 # Don't copy them twice
274 # Don't copy them twice
275 @issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}}
275 @issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}}
276 end
276 end
277
277
278 @issues.each do |orig_issue|
278 @issues.each do |orig_issue|
279 orig_issue.reload
279 orig_issue.reload
280 if @copy
280 if @copy
281 issue = orig_issue.copy({},
281 issue = orig_issue.copy({},
282 :attachments => copy_attachments,
282 :attachments => copy_attachments,
283 :subtasks => copy_subtasks,
283 :subtasks => copy_subtasks,
284 :link => link_copy?(params[:link_copy])
284 :link => link_copy?(params[:link_copy])
285 )
285 )
286 else
286 else
287 issue = orig_issue
287 issue = orig_issue
288 end
288 end
289 journal = issue.init_journal(User.current, params[:notes])
289 journal = issue.init_journal(User.current, params[:notes])
290 issue.safe_attributes = attributes
290 issue.safe_attributes = attributes
291 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 })
292 if issue.save
292 if issue.save
293 saved_issues << issue
293 saved_issues << issue
294 else
294 else
295 unsaved_issues << orig_issue
295 unsaved_issues << orig_issue
296 end
296 end
297 end
297 end
298
298
299 if unsaved_issues.empty?
299 if unsaved_issues.empty?
300 flash[:notice] = l(:notice_successful_update) unless saved_issues.empty?
300 flash[:notice] = l(:notice_successful_update) unless saved_issues.empty?
301 if params[:follow]
301 if params[:follow]
302 if @issues.size == 1 && saved_issues.size == 1
302 if @issues.size == 1 && saved_issues.size == 1
303 redirect_to issue_path(saved_issues.first)
303 redirect_to issue_path(saved_issues.first)
304 elsif saved_issues.map(&:project).uniq.size == 1
304 elsif saved_issues.map(&:project).uniq.size == 1
305 redirect_to project_issues_path(saved_issues.map(&:project).first)
305 redirect_to project_issues_path(saved_issues.map(&:project).first)
306 end
306 end
307 else
307 else
308 redirect_back_or_default _project_issues_path(@project)
308 redirect_back_or_default _project_issues_path(@project)
309 end
309 end
310 else
310 else
311 @saved_issues = @issues
311 @saved_issues = @issues
312 @unsaved_issues = unsaved_issues
312 @unsaved_issues = unsaved_issues
313 @issues = Issue.visible.where(:id => @unsaved_issues.map(&:id)).to_a
313 @issues = Issue.visible.where(:id => @unsaved_issues.map(&:id)).to_a
314 bulk_edit
314 bulk_edit
315 render :action => 'bulk_edit'
315 render :action => 'bulk_edit'
316 end
316 end
317 end
317 end
318
318
319 def destroy
319 def destroy
320 @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
321 if @hours > 0
321 if @hours > 0
322 case params[:todo]
322 case params[:todo]
323 when 'destroy'
323 when 'destroy'
324 # nothing to do
324 # nothing to do
325 when 'nullify'
325 when 'nullify'
326 TimeEntry.where(['issue_id IN (?)', @issues]).update_all('issue_id = NULL')
326 TimeEntry.where(['issue_id IN (?)', @issues]).update_all('issue_id = NULL')
327 when 'reassign'
327 when 'reassign'
328 reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
328 reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
329 if reassign_to.nil?
329 if reassign_to.nil?
330 flash.now[:error] = l(:error_issue_not_found_in_project)
330 flash.now[:error] = l(:error_issue_not_found_in_project)
331 return
331 return
332 else
332 else
333 TimeEntry.where(['issue_id IN (?)', @issues]).
333 TimeEntry.where(['issue_id IN (?)', @issues]).
334 update_all("issue_id = #{reassign_to.id}")
334 update_all("issue_id = #{reassign_to.id}")
335 end
335 end
336 else
336 else
337 # display the destroy form if it's a user request
337 # display the destroy form if it's a user request
338 return unless api_request?
338 return unless api_request?
339 end
339 end
340 end
340 end
341 @issues.each do |issue|
341 @issues.each do |issue|
342 begin
342 begin
343 issue.reload.destroy
343 issue.reload.destroy
344 rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists
344 rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists
345 # nothing to do, issue was already deleted (eg. by a parent)
345 # nothing to do, issue was already deleted (eg. by a parent)
346 end
346 end
347 end
347 end
348 respond_to do |format|
348 respond_to do |format|
349 format.html { redirect_back_or_default _project_issues_path(@project) }
349 format.html { redirect_back_or_default _project_issues_path(@project) }
350 format.api { render_api_ok }
350 format.api { render_api_ok }
351 end
351 end
352 end
352 end
353
353
354 private
354 private
355
355
356 def retrieve_previous_and_next_issue_ids
356 def retrieve_previous_and_next_issue_ids
357 retrieve_query_from_session
357 if params[:prev_issue_id].present? || params[:next_issue_id].present?
358 if @query
358 @prev_issue_id = params[:prev_issue_id].presence.try(:to_i)
359 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
359 @next_issue_id = params[:next_issue_id].presence.try(:to_i)
360 sort_update(@query.sortable_columns, 'issues_index_sort')
360 @issue_position = params[:issue_position].presence.try(:to_i)
361 limit = 500
361 @issue_count = params[:issue_count].presence.try(:to_i)
362 issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])
362 else
363 if (idx = issue_ids.index(@issue.id)) && idx < limit
363 retrieve_query_from_session
364 if issue_ids.size < 500
364 if @query
365 @issue_position = idx + 1
365 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
366 @issue_count = issue_ids.size
366 sort_update(@query.sortable_columns, 'issues_index_sort')
367 limit = 500
368 issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])
369 if (idx = issue_ids.index(@issue.id)) && idx < limit
370 if issue_ids.size < 500
371 @issue_position = idx + 1
372 @issue_count = issue_ids.size
373 end
374 @prev_issue_id = issue_ids[idx - 1] if idx > 0
375 @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
367 end
376 end
368 @prev_issue_id = issue_ids[idx - 1] if idx > 0
369 @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
370 end
377 end
371 end
378 end
372 end
379 end
373
380
381 def previous_and_next_issue_ids_params
382 {
383 :prev_issue_id => params[:prev_issue_id],
384 :next_issue_id => params[:next_issue_id],
385 :issue_position => params[:issue_position],
386 :issue_count => params[:issue_count]
387 }.reject {|k,v| k.blank?}
388 end
389
374 # Used by #edit and #update to set some common instance variables
390 # Used by #edit and #update to set some common instance variables
375 # from the params
391 # from the params
376 def update_issue_from_params
392 def update_issue_from_params
377 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
393 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
378 if params[:time_entry]
394 if params[:time_entry]
379 @time_entry.safe_attributes = params[:time_entry]
395 @time_entry.safe_attributes = params[:time_entry]
380 end
396 end
381
397
382 @issue.init_journal(User.current)
398 @issue.init_journal(User.current)
383
399
384 issue_attributes = params[:issue]
400 issue_attributes = params[:issue]
385 if issue_attributes && params[:conflict_resolution]
401 if issue_attributes && params[:conflict_resolution]
386 case params[:conflict_resolution]
402 case params[:conflict_resolution]
387 when 'overwrite'
403 when 'overwrite'
388 issue_attributes = issue_attributes.dup
404 issue_attributes = issue_attributes.dup
389 issue_attributes.delete(:lock_version)
405 issue_attributes.delete(:lock_version)
390 when 'add_notes'
406 when 'add_notes'
391 issue_attributes = issue_attributes.slice(:notes, :private_notes)
407 issue_attributes = issue_attributes.slice(:notes, :private_notes)
392 when 'cancel'
408 when 'cancel'
393 redirect_to issue_path(@issue)
409 redirect_to issue_path(@issue)
394 return false
410 return false
395 end
411 end
396 end
412 end
397 @issue.safe_attributes = issue_attributes
413 @issue.safe_attributes = issue_attributes
398 @priorities = IssuePriority.active
414 @priorities = IssuePriority.active
399 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
415 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
400 true
416 true
401 end
417 end
402
418
403 # Used by #new and #create to build a new issue from the params
419 # Used by #new and #create to build a new issue from the params
404 # The new issue will be copied from an existing one if copy_from parameter is given
420 # The new issue will be copied from an existing one if copy_from parameter is given
405 def build_new_issue_from_params
421 def build_new_issue_from_params
406 @issue = Issue.new
422 @issue = Issue.new
407 if params[:copy_from]
423 if params[:copy_from]
408 begin
424 begin
409 @issue.init_journal(User.current)
425 @issue.init_journal(User.current)
410 @copy_from = Issue.visible.find(params[:copy_from])
426 @copy_from = Issue.visible.find(params[:copy_from])
411 unless User.current.allowed_to?(:copy_issues, @copy_from.project)
427 unless User.current.allowed_to?(:copy_issues, @copy_from.project)
412 raise ::Unauthorized
428 raise ::Unauthorized
413 end
429 end
414 @link_copy = link_copy?(params[:link_copy]) || request.get?
430 @link_copy = link_copy?(params[:link_copy]) || request.get?
415 @copy_attachments = params[:copy_attachments].present? || request.get?
431 @copy_attachments = params[:copy_attachments].present? || request.get?
416 @copy_subtasks = params[:copy_subtasks].present? || request.get?
432 @copy_subtasks = params[:copy_subtasks].present? || request.get?
417 @issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks, :link => @link_copy)
433 @issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks, :link => @link_copy)
418 @issue.parent_issue_id = @copy_from.parent_id
434 @issue.parent_issue_id = @copy_from.parent_id
419 rescue ActiveRecord::RecordNotFound
435 rescue ActiveRecord::RecordNotFound
420 render_404
436 render_404
421 return
437 return
422 end
438 end
423 end
439 end
424 @issue.project = @project
440 @issue.project = @project
425 if request.get?
441 if request.get?
426 @issue.project ||= @issue.allowed_target_projects.first
442 @issue.project ||= @issue.allowed_target_projects.first
427 end
443 end
428 @issue.author ||= User.current
444 @issue.author ||= User.current
429 @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date?
445 @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date?
430
446
431 attrs = (params[:issue] || {}).deep_dup
447 attrs = (params[:issue] || {}).deep_dup
432 if action_name == 'new' && params[:was_default_status] == attrs[:status_id]
448 if action_name == 'new' && params[:was_default_status] == attrs[:status_id]
433 attrs.delete(:status_id)
449 attrs.delete(:status_id)
434 end
450 end
435 if action_name == 'new' && params[:form_update_triggered_by] == 'issue_project_id'
451 if action_name == 'new' && params[:form_update_triggered_by] == 'issue_project_id'
436 # Discard submitted version when changing the project on the issue form
452 # Discard submitted version when changing the project on the issue form
437 # so we can use the default version for the new project
453 # so we can use the default version for the new project
438 attrs.delete(:fixed_version_id)
454 attrs.delete(:fixed_version_id)
439 end
455 end
440 @issue.safe_attributes = attrs
456 @issue.safe_attributes = attrs
441
457
442 if @issue.project
458 if @issue.project
443 @issue.tracker ||= @issue.project.trackers.first
459 @issue.tracker ||= @issue.project.trackers.first
444 if @issue.tracker.nil?
460 if @issue.tracker.nil?
445 render_error l(:error_no_tracker_in_project)
461 render_error l(:error_no_tracker_in_project)
446 return false
462 return false
447 end
463 end
448 if @issue.status.nil?
464 if @issue.status.nil?
449 render_error l(:error_no_default_issue_status)
465 render_error l(:error_no_default_issue_status)
450 return false
466 return false
451 end
467 end
452 end
468 end
453
469
454 @priorities = IssuePriority.active
470 @priorities = IssuePriority.active
455 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
471 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
456 end
472 end
457
473
458 def parse_params_for_bulk_issue_attributes(params)
474 def parse_params_for_bulk_issue_attributes(params)
459 attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
475 attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
460 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
476 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
461 if custom = attributes[:custom_field_values]
477 if custom = attributes[:custom_field_values]
462 custom.reject! {|k,v| v.blank?}
478 custom.reject! {|k,v| v.blank?}
463 custom.keys.each do |k|
479 custom.keys.each do |k|
464 if custom[k].is_a?(Array)
480 if custom[k].is_a?(Array)
465 custom[k] << '' if custom[k].delete('__none__')
481 custom[k] << '' if custom[k].delete('__none__')
466 else
482 else
467 custom[k] = '' if custom[k] == '__none__'
483 custom[k] = '' if custom[k] == '__none__'
468 end
484 end
469 end
485 end
470 end
486 end
471 attributes
487 attributes
472 end
488 end
473
489
474 # Saves @issue and a time_entry from the parameters
490 # Saves @issue and a time_entry from the parameters
475 def save_issue_with_child_records
491 def save_issue_with_child_records
476 Issue.transaction do
492 Issue.transaction do
477 if params[:time_entry] && (params[:time_entry][:hours].present? || params[:time_entry][:comments].present?) && User.current.allowed_to?(:log_time, @issue.project)
493 if params[:time_entry] && (params[:time_entry][:hours].present? || params[:time_entry][:comments].present?) && User.current.allowed_to?(:log_time, @issue.project)
478 time_entry = @time_entry || TimeEntry.new
494 time_entry = @time_entry || TimeEntry.new
479 time_entry.project = @issue.project
495 time_entry.project = @issue.project
480 time_entry.issue = @issue
496 time_entry.issue = @issue
481 time_entry.user = User.current
497 time_entry.user = User.current
482 time_entry.spent_on = User.current.today
498 time_entry.spent_on = User.current.today
483 time_entry.attributes = params[:time_entry]
499 time_entry.attributes = params[:time_entry]
484 @issue.time_entries << time_entry
500 @issue.time_entries << time_entry
485 end
501 end
486
502
487 call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
503 call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
488 if @issue.save
504 if @issue.save
489 call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
505 call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
490 else
506 else
491 raise ActiveRecord::Rollback
507 raise ActiveRecord::Rollback
492 end
508 end
493 end
509 end
494 end
510 end
495
511
496 # Returns true if the issue copy should be linked
512 # Returns true if the issue copy should be linked
497 # to the original issue
513 # to the original issue
498 def link_copy?(param)
514 def link_copy?(param)
499 case Setting.link_copied_issue
515 case Setting.link_copied_issue
500 when 'yes'
516 when 'yes'
501 true
517 true
502 when 'no'
518 when 'no'
503 false
519 false
504 when 'ask'
520 when 'ask'
505 param == '1'
521 param == '1'
506 end
522 end
507 end
523 end
508
524
509 # Redirects user after a successful issue creation
525 # Redirects user after a successful issue creation
510 def redirect_after_create
526 def redirect_after_create
511 if params[:continue]
527 if params[:continue]
512 attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
528 attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
513 if params[:project_id]
529 if params[:project_id]
514 redirect_to new_project_issue_path(@issue.project, :issue => attrs)
530 redirect_to new_project_issue_path(@issue.project, :issue => attrs)
515 else
531 else
516 attrs.merge! :project_id => @issue.project_id
532 attrs.merge! :project_id => @issue.project_id
517 redirect_to new_issue_path(:issue => attrs)
533 redirect_to new_issue_path(:issue => attrs)
518 end
534 end
519 else
535 else
520 redirect_to issue_path(@issue)
536 redirect_to issue_path(@issue)
521 end
537 end
522 end
538 end
523 end
539 end
Show file before | Show file after | Hide comments
@@ -1,54 +1,59
1 <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
1 <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
2 <%= error_messages_for 'issue', 'time_entry' %>
2 <%= error_messages_for 'issue', 'time_entry' %>
3 <%= render :partial => 'conflict' if @conflict %>
3 <%= render :partial => 'conflict' if @conflict %>
4 <div class="box">
4 <div class="box">
5 <% if @issue.attributes_editable? %>
5 <% if @issue.attributes_editable? %>
6 <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend>
6 <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend>
7 <div id="all_attributes">
7 <div id="all_attributes">
8 <%= render :partial => 'form', :locals => {:f => f} %>
8 <%= render :partial => 'form', :locals => {:f => f} %>
9 </div>
9 </div>
10 </fieldset>
10 </fieldset>
11 <% end %>
11 <% end %>
12 <% if User.current.allowed_to?(:log_time, @project) %>
12 <% if User.current.allowed_to?(:log_time, @project) %>
13 <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend>
13 <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend>
14 <%= labelled_fields_for :time_entry, @time_entry do |time_entry| %>
14 <%= labelled_fields_for :time_entry, @time_entry do |time_entry| %>
15 <div class="splitcontent">
15 <div class="splitcontent">
16 <div class="splitcontentleft">
16 <div class="splitcontentleft">
17 <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
17 <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
18 </div>
18 </div>
19 <div class="splitcontentright">
19 <div class="splitcontentright">
20 <p><%= time_entry.select :activity_id, activity_collection_for_select_options %></p>
20 <p><%= time_entry.select :activity_id, activity_collection_for_select_options %></p>
21 </div>
21 </div>
22 </div>
22 </div>
23 <p><%= time_entry.text_field :comments, :size => 60 %></p>
23 <p><%= time_entry.text_field :comments, :size => 60 %></p>
24 <% @time_entry.custom_field_values.each do |value| %>
24 <% @time_entry.custom_field_values.each do |value| %>
25 <p><%= custom_field_tag_with_label :time_entry, value %></p>
25 <p><%= custom_field_tag_with_label :time_entry, value %></p>
26 <% end %>
26 <% end %>
27 <% end %>
27 <% end %>
28 </fieldset>
28 </fieldset>
29 <% end %>
29 <% end %>
30
30
31 <fieldset><legend><%= l(:field_notes) %></legend>
31 <fieldset><legend><%= l(:field_notes) %></legend>
32 <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :no_label => true %>
32 <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :no_label => true %>
33 <%= wikitoolbar_for 'issue_notes' %>
33 <%= wikitoolbar_for 'issue_notes' %>
34
34
35 <% if @issue.safe_attribute? 'private_notes' %>
35 <% if @issue.safe_attribute? 'private_notes' %>
36 <%= f.check_box :private_notes, :no_label => true %> <label for="issue_private_notes"><%= l(:field_private_notes) %></label>
36 <%= f.check_box :private_notes, :no_label => true %> <label for="issue_private_notes"><%= l(:field_private_notes) %></label>
37 <% end %>
37 <% end %>
38
38
39 <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
39 <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
40 </fieldset>
40 </fieldset>
41
41
42 <fieldset><legend><%= l(:label_attachment_plural) %></legend>
42 <fieldset><legend><%= l(:label_attachment_plural) %></legend>
43 <p><%= render :partial => 'attachments/form', :locals => {:container => @issue} %></p>
43 <p><%= render :partial => 'attachments/form', :locals => {:container => @issue} %></p>
44 </fieldset>
44 </fieldset>
45 </div>
45 </div>
46
46
47 <%= f.hidden_field :lock_version %>
47 <%= f.hidden_field :lock_version %>
48 <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
48 <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
49 <%= submit_tag l(:button_submit) %>
49 <%= submit_tag l(:button_submit) %>
50 <%= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' %>
50 <%= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' %>
51 | <%= link_to l(:button_cancel), {}, :onclick => "$('#update').hide(); return false;" %>
51 | <%= link_to l(:button_cancel), {}, :onclick => "$('#update').hide(); return false;" %>
52
53 <%= hidden_field_tag 'prev_issue_id', @prev_issue_id if @prev_issue_id %>
54 <%= hidden_field_tag 'next_issue_id', @next_issue_id if @next_issue_id %>
55 <%= hidden_field_tag 'issue_position', @issue_position if @issue_position %>
56 <%= hidden_field_tag 'issue_count', @issue_count if @issue_count %>
52 <% end %>
57 <% end %>
53
58
54 <div id="preview" class="wiki"></div>
59 <div id="preview" class="wiki"></div>
Show file before | Show file after | Hide comments
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