diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 3263ebc07..140d49f37 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -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 diff --git a/app/views/issues/update.js.erb b/app/views/issues/update.js.erb index 8ff6e5245..cb281de72 100644 --- a/app/views/issues/update.js.erb +++ b/app/views/issues/update.js.erb @@ -1,3 +1,4 @@ +<% if @saved %> $("#issue_detail").replaceWith('<%= escape_javascript(render :partial => 'issues/detail') %>') $("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/edit') %>') $("#issue_detail").show(); @@ -17,4 +18,6 @@ issue_desc_editor = KindEditor.create('#issue_description', "allowFileManager":true, "uploadJson":"/kindeditor/upload", "fileManagerJson":"/kindeditor/filemanager"}); - +<%else%> + alert('<%= @issue.errors.full_messages[0].to_s%>') +<%end %>