diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-29 17:07:07 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-29 17:07:07 +0000 |
| commit | 53a0cee57a0bbda3d47791eb189b5f4bd6511760 (patch) | |
| tree | 5135a22f398c36cf89b6e074abf353f346e1baad | |
| parent | 251d62c2bfd25b6ed27f03369c555b0d61e2ad70 (diff) | |
| download | redmine-53a0cee57a0bbda3d47791eb189b5f4bd6511760.tar.gz redmine-53a0cee57a0bbda3d47791eb189b5f4bd6511760.zip | |
Fixed that logging time inside redirects at global time logging (#11038).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9740 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/timelog/new.html.erb | 1 | ||||
| -rw-r--r-- | test/functional/timelog_controller_test.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/views/timelog/new.html.erb b/app/views/timelog/new.html.erb index 84bf7dae1..95253e82f 100644 --- a/app/views/timelog/new.html.erb +++ b/app/views/timelog/new.html.erb @@ -1,6 +1,7 @@ <h2><%= l(:label_spent_time) %></h2> <%= labelled_form_for @time_entry, :url => time_entries_path do |f| %> + <%= hidden_field_tag 'project_id', params[:project_id] if params[:project_id] %> <%= render :partial => 'form', :locals => {:f => f} %> <%= submit_tag l(:button_create) %> <%= submit_tag l(:button_create_and_continue), :name => 'continue' %> diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index 410bbd3e5..e64919f38 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -44,6 +44,7 @@ class TimelogControllerTest < ActionController::TestCase # Default activity selected assert_tag :tag => 'option', :attributes => { :selected => 'selected' }, :content => 'Development' + assert_select 'input[name=project_id][value=1]' end def test_get_new_should_only_show_active_time_entry_activities @@ -61,6 +62,7 @@ class TimelogControllerTest < ActionController::TestCase assert_response :success assert_template 'new' assert_tag 'select', :attributes => {:name => 'time_entry[project_id]'} + assert_select 'input[name=project_id]', 0 end def test_new_without_project_should_deny_without_permission |