Merged r3315 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3316 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis
2010-01-14 23:33:48 +00:00
parent 1efb25a433
commit f60881518a
3 changed files with 58 additions and 12 deletions
+2 -2
View File
@@ -202,7 +202,7 @@ class IssuesController < ApplicationController
flash[:notice] = l(:notice_successful_update)
end
call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
redirect_back_or_default({:action => 'show', :id => @issue})
end
end
rescue ActiveRecord::StaleObjectError
@@ -269,7 +269,7 @@ class IssuesController < ApplicationController
:total => @issues.size,
:ids => '#' + unsaved_issue_ids.join(', #'))
end
redirect_to(params[:back_to] || {:controller => 'issues', :action => 'index', :project_id => @project})
redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
return
end
@available_statuses = Workflow.available_statuses(@project)