SONAR-2872 The TimeLine widget can't be displayed with Oracle DB

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb
index 8926d74132385386eb94993f7e7a6dba17e372c7..83795e61ed960a837b69b8a3befc09cbe84ddc08 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/timeline.html.erb
@@ -46,7 +46,9 @@
       metric_data_map[metric_id].each() do |metric_data|
         # for every metric value, we need to check that the corresponding snapshot has values for each metric (if not, Protovis won't be able to display)
         if metric_count_per_snapshot_id[metric_data[:sid]]==total_number_of_metrics
-          m_date = Time.parse(metric_data[:date])
+          m_date = metric_data[:date]
+          # Only Oracle returns a Time object, so let's parse this string if it's not a Time instance
+          m_date = Time.parse(metric_data[:date]) unless m_date.is_a? Time 
           js_data += "{x:d("
           js_data += m_date.year.to_s
           js_data += ","
@@ -86,7 +88,9 @@
     unless from_date
       # find the oldest date
       metric_data_map.values.each() do |metric_data_array|
-        first_date = Time.parse(metric_data_array[0][:date])
+        first_date = metric_data_array[0][:date]
+        # Only Oracle returns a Time object, so let's parse this string if it's not a Time instance
+        first_date = Time.parse(metric_data_array[0][:date]) unless first_date.is_a? Time
         from_date = first_date if !from_date || from_date > first_date  
       end
     end