aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2012-12-11 10:19:14 +0100
committerSimon Brandhof <simon.brandhof@gmail.com>2012-12-11 10:19:14 +0100
commit83d841d1a1c8d871f8477d16d7eb16f1631506d0 (patch)
treed59316b9cff906fca81a1c008a3fbd73cec3a820 /sonar-server
parentaa4a3dc35721fd6fdaaa819c17fb0ec2a506a6fe (diff)
downloadsonarqube-83d841d1a1c8d871f8477d16d7eb16f1631506d0.tar.gz
sonarqube-83d841d1a1c8d871f8477d16d7eb16f1631506d0.zip
SONAR-3825 fix migration of conditions on new_ metrics
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/db/migrate/360_move_existing_measure_filters.rb2
1 files changed, 1 insertions, 1 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 9fee2977e5a..606494245f2 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
@@ -126,7 +126,7 @@ class MoveExistingMeasureFilters < ActiveRecord::Migration
data << "c#{metric_criteria_id}_metric=#{old.kee}"
data << "c#{metric_criteria_id}_op=#{operator_code(old.operator)}"
data << "c#{metric_criteria_id}_val=#{old.value}"
- data << "c#{metric_criteria_id}_period=#{old_filter.period_index}" if old.variation && old_filter.period_index
+ data << "c#{metric_criteria_id}_period=#{old_filter.period_index}" if old_filter.period_index && (old.variation || old.kee.start_with?('new_'))
metric_criteria_id += 1
elsif old.family=='direct-children' && old.text_value=='true'
data << "onBaseComponents=true"