meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-25 09:51:14 +00:00
Code Issues Releases Wiki Activity

code layout clean up IssuesController#update

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@19146 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2019-11-22 04:24:21 +00:00
parent aebbd7fcc7
commit bee8063f46
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/controllers/issues_controller.rb
View File

@ -166,7 +166,8 @@ class IssuesController < ApplicationController
def update
return unless update_issue_from_params
@issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
@issue.save_attachments(params[:attachments] ||
(params[:issue] && params[:issue][:uploads]))
saved = false
begin
saved = save_issue_with_child_records
@ -174,16 +175,23 @@ class IssuesController < ApplicationController
@conflict = true
if params[:last_journal_id]
@conflict_journals = @issue.journals_after(params[:last_journal_id]).to_a
@conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
unless User.current.allowed_to?(:view_private_notes, @issue.project)
@conflict_journals.reject!(&:private_notes?)
end
end
end
if saved
render_attachment_warning_if_needed(@issue)
flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record? || params[:no_flash]
unless @issue.current_journal.new_record? || params[:no_flash]
flash[:notice] = l(:notice_successful_update)
end
respond_to do |format|
format.html { redirect_back_or_default issue_path(@issue, previous_and_next_issue_ids_params) }
format.html {
redirect_back_or_default(
issue_path(@issue, previous_and_next_issue_ids_params)
)
}
format.api { render_api_ok }
end
else