feature-5156-v2.diff

patch with tests - Go MAEDA, 2016-03-30 12:37

Download (1.67 KB)

View differences:

app/views/issues/bulk_edit.html.erb (working copy)
160 160
</p>
161 161
<% end %>
162 162

  
163
<% if @safe_attributes.include?('estimated_hours') %>
164
<p>
165
  <label for='issue_estimated_hours'><%= l(:field_estimated_hours) %></label>
166
  <%= text_field_tag 'issue[estimated_hours]', '', :value => @issue_params[:estimated_hours], :size => 10 %>
167
  <label class="inline"><%= check_box_tag 'issue[estimated_hours]', 'none', (@issue_params[:estimated_hours] == 'none'), :id => nil, :data => {:disables => '#issue_estimated_hours'} %><%= l(:button_clear) %></label>
168
</p>
169
<% end %>
170

  
163 171
<% if @safe_attributes.include?('done_ratio') && Issue.use_field_for_done_ratio? %>
164 172
<p>
165 173
  <label for='issue_done_ratio'><%= l(:field_done_ratio) %></label>
test/functional/issues_controller_test.rb (working copy)
4032 4032
    assert_equal [1, 3], parent.children.collect(&:id).sort
4033 4033
  end
4034 4034

  
4035
  def test_bulk_update_estimated_hours
4036
    @request.session[:user_id] = 2
4037
    post :bulk_update, :ids => [1, 2], :issue => {:estimated_hours => 4.25}
4038

  
4039
    assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
4040
    assert_equal 4.25, Issue.find(1).estimated_hours
4041
    assert_equal 4.25, Issue.find(2).estimated_hours
4042
  end
4043

  
4035 4044
  def test_bulk_update_custom_field
4036 4045
    @request.session[:user_id] = 2
4037 4046
    # update issues priority