jro_apps/redmine Commit - r14286:b0a47cc5ba2e

Fixes float conversion failures (#1561)....

Jean-Philippe Lang -

r14286:b0a47cc5ba2e

parent child

Context file:

r14286:b0a47cc5ba2e

app/models/issue_query.rb +3 -2

               # Returns sum of all the issue's estimated_hours
               def total_for_estimated_hours(scope)
-                scope.sum(:estimated_hours)
+                map_total(scope.sum(:estimated_hours)) {|t| t.to_f.round(2)}
               end
               # Returns sum of all the issue's time entries hours
               def total_for_spent_hours(scope)
-                if group_by_column.try(:name) == :project
+                total = if group_by_column.try(:name) == :project
                   # TODO: remove this when https://github.com/rails/rails/issues/21922 is fixed
                   # We have to do a custom join without the time_entries.project_id column
                   # that would trigger a ambiguous column name error
                 else
                   scope.joins(:time_entries).sum("#{TimeEntry.table_name}.hours")
                 end
+                map_total(total) {|t| t.to_f.round(2)}
               end
               # Returns the issues

app/models/query.rb +10 -8

                 total_for_custom_field(custom_field, scope) {|t| t.to_i}
               end
-              def total_for_custom_field(custom_field, scope)
+              def total_for_custom_field(custom_field, scope, &block)
                 total = scope.joins(:custom_values).
                   where(:custom_values => {:custom_field_id => custom_field.id}).
                   where.not(:custom_values => {:value => ''}).
                   sum("CAST(#{CustomValue.table_name}.value AS decimal(30,3))")
-                if block_given?
+                total = map_total(total, &block) if block_given?
-                  if total.is_a?(Hash)
+                total
-                    total.keys.each {|k| total[k] = yield total[k]}
+              end
-                  else
-                    total = yield total
-                  end
-                end
+              def map_total(total, &block)
+                if total.is_a?(Hash)
+                  total.keys.each {|k| total[k] = yield total[k]}
+                else
+                  total = yield total
+                end
                 total
               end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages