Project

General

Profile

Defect #34641 » 34641.patch

Yuichi HARADA, 2021-01-27 02:54

View differences:

app/views/issues/_edit.html.erb
</div>
</fieldset>
<% end %>
<% if User.current.allowed_to?(:log_time, @project) %>
<fieldset class="tabular"><legend><%= l(:button_log_time) %></legend>
<fieldset id="log_time" class="tabular"><legend><%= l(:button_log_time) %></legend>
<%= labelled_fields_for :time_entry, @time_entry do |time_entry| %>
<div class="splitcontent">
<div class="splitcontentleft">
......
<p><%= custom_field_tag_with_label :time_entry, value %></p>
<% end %>
<% end %>
</fieldset>
<% end %>
</fieldset>
<%= javascript_tag("$('#log_time').hide();") unless User.current.allowed_to?(:log_time, @project) %>
<% if @issue.notes_addable? %>
<fieldset><legend><%= l(:field_notes) %></legend>
<%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit',
test/functional/issues_controller_test.rb
@request.session[:user_id] = 2
Role.find_by_name('Manager').update_attribute :permissions, [:view_issues, :edit_issues, :log_time]
get(:edit, :params => {:id => 1})
assert_select 'input[name=?]', 'time_entry[hours]'
assert_select '#log_time' do
assert_select 'input[name=?]', 'time_entry[hours]'
end
assert_no_match /#{Regexp.quote("$('#log_time').hide();")}/, response.body
end
def test_get_edit_should_not_display_the_time_entry_form_without_log_time_permission
@request.session[:user_id] = 2
Role.find_by_name('Manager').remove_permission! :log_time
get(:edit, :params => {:id => 1})
assert_select 'input[name=?]', 'time_entry[hours]', 0
assert_select '#log_time' do
assert_select 'input[name=?]', 'time_entry[hours]'
end
assert_match /#{Regexp.quote("$('#log_time').hide();")}/, response.body
end
def test_get_edit_with_params
(1-1/5)