diff options
| -rw-r--r-- | app/views/issues/_edit.html.erb | 2 | ||||
| -rw-r--r-- | test/functional/issues_controller_test.rb | 35 |
2 files changed, 36 insertions, 1 deletions
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 35527773d..fa8486c54 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -21,7 +21,7 @@ </div> </div> <p><%= time_entry.text_field :comments, :size => 60 %></p> - <% @time_entry.custom_field_values.each do |value| %> + <% @time_entry.editable_custom_field_values.each do |value| %> <p><%= custom_field_tag_with_label :time_entry, value %></p> <% end %> <% end %> diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index c53cfb391..2ee1a2c41 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -4875,6 +4875,41 @@ class IssuesControllerTest < Redmine::ControllerTest end end + def test_get_edit_should_display_visible_spent_time_custom_field + @request.session[:user_id] = 2 + + get( + :edit, + :params => { + :id => 13, + } + ) + + assert_response :success + + assert_select '#issue-form select#time_entry_custom_field_values_10', 1 + end + + def test_get_edit_should_not_display_spent_time_custom_field_not_visible + cf = TimeEntryCustomField.find(10) + cf.visible = false + cf.role_ids = [1] + cf.save! + + @request.session[:user_id] = 2 + + get( + :edit, + :params => { + :id => 13, + } + ) + + assert_response :success + + assert_select '#issue-form select#time_entry_custom_field_values_10', 0 + end + def test_update_form_for_existing_issue @request.session[:user_id] = 2 patch :edit, :params => { |