|
|
|
@ -219,7 +219,7 @@ class IssuesController < ApplicationController
|
|
|
|
|
@issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
|
|
|
|
|
saved = false
|
|
|
|
|
begin
|
|
|
|
|
saved = @issue.save_issue_with_child_records(params, @time_entry)
|
|
|
|
|
@saved = @issue.save_issue_with_child_records(params, @time_entry)
|
|
|
|
|
rescue ActiveRecord::StaleObjectError
|
|
|
|
|
@conflict = true
|
|
|
|
|
if params[:last_journal_id]
|
|
|
|
@ -228,7 +228,7 @@ class IssuesController < ApplicationController
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
if saved
|
|
|
|
|
if @saved
|
|
|
|
|
#修改界面增加跟踪者
|
|
|
|
|
watcherlist = @issue.watcher_users
|
|
|
|
|
select_users = []
|
|
|
|
@ -265,6 +265,8 @@ class IssuesController < ApplicationController
|
|
|
|
|
end
|
|
|
|
|
else
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
|
|
|
|
|
format.js
|
|
|
|
|
format.html { render :action => 'edit' }
|
|
|
|
|
format.api { render_validation_errors(@issue) }
|
|
|
|
|
end
|
|
|
|
|