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

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
This commit is contained in:
Jean-Philippe Lang 2012-05-29 17:07:07 +00:00
parent 251d62c2bf
commit 53a0cee57a
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/timelog/new.html.erb
View File

@ -1,6 +1,7 @@
<h2><%= l(:label_spent_time) %></h2> <h2><%= l(:label_spent_time) %></h2>
<%= labelled_form_for @time_entry, :url => time_entries_path do |f| %> <%= 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} %> <%= render :partial => 'form', :locals => {:f => f} %>
<%= submit_tag l(:button_create) %> <%= submit_tag l(:button_create) %>
<%= submit_tag l(:button_create_and_continue), :name => 'continue' %> <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>

2
test/functional/timelog_controller_test.rb
View File

@ -44,6 +44,7 @@ class TimelogControllerTest < ActionController::TestCase
# Default activity selected # Default activity selected
assert_tag :tag => 'option', :attributes => { :selected => 'selected' }, assert_tag :tag => 'option', :attributes => { :selected => 'selected' },
:content => 'Development' :content => 'Development'
assert_select 'input[name=project_id][value=1]'
end end
def test_get_new_should_only_show_active_time_entry_activities def test_get_new_should_only_show_active_time_entry_activities
@ -61,6 +62,7 @@ class TimelogControllerTest < ActionController::TestCase
assert_response :success assert_response :success
assert_template 'new' assert_template 'new'
assert_tag 'select', :attributes => {:name => 'time_entry[project_id]'} assert_tag 'select', :attributes => {:name => 'time_entry[project_id]'}
assert_select 'input[name=project_id]', 0
end end
def test_new_without_project_should_deny_without_permission def test_new_without_project_should_deny_without_permission