Browse Source

Do not display in issue edit page spent time custom fields not visible by the user (#33550).

Patch by  Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@20801 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.2.0
Go MAEDA 3 years ago
parent
commit
c54349cc0b
2 changed files with 36 additions and 1 deletions
  1. 1
    1
      app/views/issues/_edit.html.erb
  2. 35
    0
      test/functional/issues_controller_test.rb

+ 1
- 1
app/views/issues/_edit.html.erb View File

@@ -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 %>

+ 35
- 0
test/functional/issues_controller_test.rb View File

@@ -5658,6 +5658,41 @@ class IssuesControllerTest < Redmine::ControllerTest
assert_select 'span.icon-warning[title=?]', reason, :text => reason
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.cf_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.cf_10', 0
end

def test_update_form_for_existing_issue
@request.session[:user_id] = 2
patch(

Loading…
Cancel
Save