From 54ad3e74c218d12178f08882e0a7c337e042c078 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 10 Dec 2012 22:28:34 +0100 Subject: [PATCH] SONAR-3825 fix migration of treemaps --- .../360_move_existing_measure_filters.rb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/360_move_existing_measure_filters.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/360_move_existing_measure_filters.rb index 85e71a55480..9fee2977e5a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/360_move_existing_measure_filters.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/360_move_existing_measure_filters.rb @@ -72,6 +72,7 @@ class MoveExistingMeasureFilters < ActiveRecord::Migration def self.move_columns(old_filter, data) columns = [] + metric_columns = [] asc = nil sort = nil old_columns = FilterColumn.find(:all, :conditions => ['filter_id=?', old_filter.id], :order => 'order_index') @@ -81,6 +82,9 @@ class MoveExistingMeasureFilters < ActiveRecord::Migration column_key += ":#{old_column.kee}" column_key += ":#{old_filter.period_index}" if old_column.variation && old_filter.period_index end + if old_column.family=='metric' + metric_columns << old_column.kee + end columns << column_key if old_column.sort_direction=='ASC' asc = true @@ -90,10 +94,15 @@ class MoveExistingMeasureFilters < ActiveRecord::Migration sort = column_key end end - data << "cols=#{columns.join(',')}" unless columns.empty? - if sort - data << "sort=#{sort}" - data << "asc=#{asc}" + if old_filter.default_view=='treemap' + data << "tmSize=#{metric_columns[0]}" if metric_columns.size>0 + data << "tmColor=#{metric_columns[1]}" if metric_columns.size>1 + else + data << "cols=#{columns.join(',')}" unless columns.empty? + if sort + data << "sort=#{sort}" + data << "asc=#{asc}" + end end end -- 2.39.5