Merged r22902 from trunk to 5.1-stable (#40924).

git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22903 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/issues/destroy.html.erb b/app/views/issues/destroy.html.erb
index 61b841a62dd6b2ebff38f83a97f7873e026b2986..e4f0e66fb50fcda236c54b0177acf2b55d10fba1 100644 (file)
--- a/app/views/issues/destroy.html.erb
+++ b/app/views/issues/destroy.html.erb
@@ -3,7 +3,7 @@
 <%= form_tag({}, :method => :delete)  do %>
 <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id, :id => nil)}.join("\n").html_safe %>
 <div class="box">
-<p><strong><%= l(:text_destroy_time_entries_question, :hours => number_with_precision(@hours, :precision => 2)) %></strong></p>
+<p><strong><%= l(:text_destroy_time_entries_question, :hours => format_hours(@hours)) %></strong></p>
 <p>
 <label><%= radio_button_tag 'todo', 'destroy', true %> <%= l(:text_destroy_time_entries) %></label><br />
 <% unless Setting.timelog_required_fields.include?('issue_id') %>

diff --git a/app/views/timelog/bulk_edit.html.erb b/app/views/timelog/bulk_edit.html.erb
index 3571b40160991aa3f0bf1720f177e2e43461bfda..a4cb0c8afc2fb774a41bb03f656eb3449cc2160b 100644 (file)
--- a/app/views/timelog/bulk_edit.html.erb
+++ b/app/views/timelog/bulk_edit.html.erb
@@ -21,7 +21,7 @@
   <%=
     content_tag 'li',
       link_to(
-        "#{format_date(entry.spent_on)} - #{entry.project}: #{l(:label_f_hour_plural, :value => entry.hours)} (#{entry.user})",
+        "#{format_date(entry.spent_on)} - #{entry.project}: #{l(:label_f_hour_plural, :value => format_hours(entry.hours))} (#{entry.user})",
         edit_time_entry_path(entry)
       )
   %>

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 014a2d835e11c2fccb873aae50615a632e0878c0..db45bb2870ee49503df7f17b2e0bb9b5bc561fac 100644 (file)
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -8204,14 +8204,16 @@ class IssuesControllerTest < Redmine::ControllerTest
     leaf = Issue.generate!
     TimeEntry.generate!(:issue => leaf)
     @request.session[:user_id] = 2
-    delete(
-      :destroy,
-      :params => {
-        :ids => [parent.id, leaf.id]
-      }
-    )
+    with_settings :timespan_format => 'minutes' do
+      delete(
+        :destroy,
+        :params => {
+          :ids => [parent.id, leaf.id]
+        }
+      )
+    end
     assert_response :success
-    assert_select 'p', :text => /3\.00 hours were reported/
+    assert_select 'p', :text => /3:00 hours were reported/
   end
 
   def test_destroy_issues_and_destroy_time_entries

diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index f3ef5cbe346f0763a8e99e039ef16a792913a65d..615b7cad22c34cd3c5f55ee665e7083c0c1dd7a4 100644 (file)
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -727,12 +727,14 @@ class TimelogControllerTest < Redmine::ControllerTest
   def test_get_bulk_edit
     @request.session[:user_id] = 2
 
-    get :bulk_edit, :params => {:ids => [1, 2]}
+    with_settings :timespan_format => 'minutes' do
+      get :bulk_edit, :params => {:ids => [1, 2]}
+    end
     assert_response :success
 
     assert_select 'ul#bulk-selection' do
       assert_select 'li', 2
-      assert_select 'li a', :text => '03/23/2007 - eCookbook: 4.25 hours (John Smith)'
+      assert_select 'li a', :text => '03/23/2007 - eCookbook: 4:15 hours (John Smith)'
     end
 
     assert_select 'form#bulk_edit_form[action=?]', '/time_entries/bulk_update' do