kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed that some error messages were not displayed (#2866). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2542 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2009-03-01 10:15:38 +00:00
parent b78349d2ca
commit 38db62f1e7
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/issues_controller.rb
View File

@ -120,8 +120,7 @@ class IssuesController < ApplicationController
# Tracker must be set before custom field values # Tracker must be set before custom field values
@issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first) @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
if @issue.tracker.nil? if @issue.tracker.nil?
flash.now[:error] = 'No tracker is associated to this project. Please check the Project settings.' render_error 'No tracker is associated to this project. Please check the Project settings.'
render :nothing => true, :layout => true
return return
end end
if params[:issue].is_a?(Hash) if params[:issue].is_a?(Hash)
@ -132,8 +131,7 @@ class IssuesController < ApplicationController
default_status = IssueStatus.default default_status = IssueStatus.default
unless default_status unless default_status
flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").' render_error 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
render :nothing => true, :layout => true
return return
end end
@issue.status = default_status @issue.status = default_status

22
test/functional/issues_controller_test.rb
View File

@ -379,6 +379,28 @@ class IssuesControllerTest < Test::Unit::TestCase
assert_equal Project.find(1).trackers.first, issue.tracker assert_equal Project.find(1).trackers.first, issue.tracker
end end
def test_get_new_with_no_default_status_should_display_an_error
@request.session[:user_id] = 2
IssueStatus.delete_all
get :new, :project_id => 1
assert_response 500
assert_not_nil flash[:error]
assert_tag :tag => 'div', :attributes => { :class => /error/ },
:content => /No default issue/
end
def test_get_new_with_no_tracker_should_display_an_error
@request.session[:user_id] = 2
Tracker.delete_all
get :new, :project_id => 1
assert_response 500
assert_not_nil flash[:error]
assert_tag :tag => 'div', :attributes => { :class => /error/ },
:content => /No tracker/
end
def test_update_new_form def test_update_new_form
@request.session[:user_id] = 2 @request.session[:user_id] = 2
xhr :post, :new, :project_id => 1, xhr :post, :new, :project_id => 1,