git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4511 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/1.1.0
end | end | ||||
def find_project | def find_project | ||||
if issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id]) | |||||
if (issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id])).present? | |||||
@issue = Issue.find(issue_id) | @issue = Issue.find(issue_id) | ||||
@project = @issue.project | @project = @issue.project | ||||
elsif project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id]) | |||||
elsif (project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])).present? | |||||
@project = Project.find(project_id) | @project = Project.find(project_id) | ||||
else | else | ||||
render_404 | render_404 |
assert_equal i, t.issue | assert_equal i, t.issue | ||||
assert_equal i.project, t.project | assert_equal i.project, t.project | ||||
end | end | ||||
def test_post_create_with_blank_issue | |||||
# TODO: should POST to issues’ time log instead of project. change form | |||||
# and routing | |||||
@request.session[:user_id] = 3 | |||||
post :create, :project_id => 1, | |||||
:time_entry => {:comments => 'Some work on TimelogControllerTest', | |||||
# Not the default activity | |||||
:activity_id => '11', | |||||
:issue_id => '', | |||||
:spent_on => '2008-03-14', | |||||
:hours => '7.3'} | |||||
assert_redirected_to :action => 'index', :project_id => 'ecookbook' | |||||
t = TimeEntry.find_by_comments('Some work on TimelogControllerTest') | |||||
assert_not_nil t | |||||
assert_equal 11, t.activity_id | |||||
assert_equal 7.3, t.hours | |||||
assert_equal 3, t.user_id | |||||
end | |||||
def test_update | def test_update | ||||
entry = TimeEntry.find(1) | entry = TimeEntry.find(1) |