SONAR-3336 Measure of 4077ms is displayed as 4.7s instead of 4s

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb
index 10c3a136c78e08b39c6ece184df2ff652e6a3d2a..2e67489889dae9a83a0ffd5946d993f512b7f75e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/project_measure.rb
@@ -145,19 +145,17 @@ class ProjectMeasure < ActiveRecord::Base
       hours = ( value / HOUR ).to_i
       mins = ( value % HOUR / MIN ).to_i
       secs = ( value % MIN / SEC ).to_i
-      return hours.to_s + ":" + leading_zero( mins ) + ":" + leading_zero( secs ) + " h"
+      return hours.to_s + ':' + leading_zero( mins ) + ':' + leading_zero( secs ) + ' h'
     elsif value.abs >= MIN
       mins = ( value / MIN ).to_i
       secs = ( value % MIN / SEC ).to_i
-      millisecs = ( value % MIN % SEC ).to_i
-      return mins.to_s + ":" + leading_zero( secs ) + " min"
+      return mins.to_s + ':' + leading_zero( secs ) + ' min'
     elsif value.abs >= SEC
       secs = ( value / SEC ).to_i
-      millisecs = ( value % SEC ).to_i
-      return secs.to_s + "." + millisecs.to_s[0, 1] + " sec" if millisecs != 0
-      return secs.to_s+ " sec" if millisecs == 0
+      ms = ( value % SEC ).to_i
+      return secs.to_s + (ms < 100 ? '' : '.' + ms.to_s[-3,1]) + ' sec'
     else
-      ( "%d" % value ) + " ms"
+      ( '%d' % value ) + ' ms'
     end
   end