diff options
Diffstat (limited to 'sonar-server/src/main/webapp/WEB-INF/app')
3 files changed, 10 insertions, 6 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb index 80da25d2f0c..a0d49e16773 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb @@ -201,7 +201,7 @@ class Api::ResourcesController < Api::ApiController def select_columns_for_measures select_columns='project_measures.id,project_measures.value,project_measures.metric_id,project_measures.snapshot_id,project_measures.rule_id,project_measures.rule_priority,project_measures.text_value,project_measures.characteristic_id' if params[:includetrends]=='true' - select_columns+=',project_measures.tendency,project_measures.diff_value_1,project_measures.diff_value_2,project_measures.diff_value_3' + select_columns+=',project_measures.tendency,project_measures.variation_value_1,project_measures.variation_value_2,project_measures.variation_value_3,project_measures.variation_value_4,project_measures.variation_value_5' end if params[:includealerts]=='true' select_columns+=',project_measures.alert_status,project_measures.alert_text' diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb index c72240dcfc2..d5e095c22ba 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb @@ -30,8 +30,8 @@ module DashboardHelper def variation_select_option(snapshot, index) return nil if snapshot.nil? || snapshot.project_snapshot.nil? - mode=snapshot.project_snapshot.send "var_mode_#{index}" - mode_param=snapshot.project_snapshot.send "var_label_#{index}" + mode=snapshot.project_snapshot.send "variation_mode_#{index}" + mode_param=snapshot.project_snapshot.send "variation_param_#{index}" if mode if mode=='days' 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 8e08ab98147..13768dcbeba 100644 --- 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 @@ -111,11 +111,15 @@ class ProjectMeasure < ActiveRecord::Base result = nil case variation_index when 1 - result=diff_value_1 + result=variation_value_1 when 2 - result=diff_value_2 + result=variation_value_2 when 3 - result=diff_value_3 + result=variation_value_3 + when 4 + result=variation_value_4 + when 5 + result=variation_value_5 end result end |