Browse Source

Fixed: 404 when entering time with blank issue id (#7099).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4511 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/1.1.0
Jean-Philippe Lang 13 years ago
parent
commit
335f8da5e8
2 changed files with 22 additions and 2 deletions
  1. 2
    2
      app/controllers/timelog_controller.rb
  2. 20
    0
      test/functional/timelog_controller_test.rb

+ 2
- 2
app/controllers/timelog_controller.rb View File

@@ -200,10 +200,10 @@ private
end

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)
@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)
else
render_404

+ 20
- 0
test/functional/timelog_controller_test.rb View File

@@ -94,6 +94,26 @@ class TimelogControllerTest < ActionController::TestCase
assert_equal i, t.issue
assert_equal i.project, t.project
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
entry = TimeEntry.find(1)

Loading…
Cancel
Save