SONAR-2496 Support 'previous-version' value for differential views

3 files changed, 54 insertions, 41 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index 871c773e30a..fb2dbf84bd2 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -102,6 +102,12 @@ module ApplicationHelper
         else
           label = message('since_previous_analysis')
         end
+      elsif mode=='previous_version'
+        unless mode_param.nil?
+          label = message('since_previous_version_detailed', :params => mode_param.to_s)
+        else
+          label = message('since_previous_version')
+        end
       elsif mode=='date'
         label = message('since_x', :params => date.strftime("%Y %b %d").to_s)
       end
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 c46fa0cb7b6..1461413d936 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
@@ -21,7 +21,6 @@ module DashboardHelper
   include WidgetPropertiesHelper
   include MetricsHelper
   include FiltersHelper
-
   def dashboard_action(action_name, opts={})
     if @resource
       { :action => action_name, :did => @dashboard.id, :id => @resource.id }.merge!(opts)
@@ -35,59 +34,65 @@ module DashboardHelper
   end
 
   def formatted_value(measure, default='')
-	measure ? measure.formatted_value : default
+    measure ? measure.formatted_value : default
   end
 
   def measure(metric_key)
-	@snapshot.measure(metric_key)
+    @snapshot.measure(metric_key)
   end
 
   def period_select_options(snapshot, index)
-	label=period_label(snapshot, index)
-	if label
-	  selected=(params[:period]==index.to_s ? 'selected' : '')
-	  "<option value='#{index}' #{selected}>&Delta; #{label}</option>"
-	else
-	  nil
-	end
+    label=period_label(snapshot, index)
+    if label
+      selected=(params[:period]==index.to_s ? 'selected' : '')
+      "<option value='#{index}' #{selected}>&Delta; #{label}</option>"
+    else
+      nil
+    end
   end
 
   def violation_period_select_options(snapshot, index)
-	return nil if snapshot.nil? || snapshot.project_snapshot.nil?
-	mode=snapshot.project_snapshot.send "period#{index}_mode"
-	mode_param=snapshot.project_snapshot.send "period#{index}_param"
-	date=snapshot.project_snapshot.send "period#{index}_date"
-
-	if mode
-	  if mode=='days'
-		label = message('added_over_x_days', :params => mode_param.to_s)
-	  elsif mode=='version'
-		label = message('added_since_version', :params => mode_param.to_s)
-	  elsif mode=='previous_analysis'
-		if !date.nil?
-		  label = message('added_since_previous_analysis_detailed', :params => date.strftime("%Y %b. %d").to_s)
-		else
-		  label = message('added_since_previous_analysis')
-		end
-	  elsif mode=='date'
-		label = message('added_since', :params => date.strftime("%Y %b %d").to_s)
-	  end
-	  if label
-		selected=(params[:period]==index.to_s ? 'selected' : '')
-		"<option value='#{index}' #{selected}>#{label}</option>"
-	  end
-	else
-	  nil
-	end
+    return nil if snapshot.nil? || snapshot.project_snapshot.nil?
+    mode=snapshot.project_snapshot.send "period#{index}_mode"
+    mode_param=snapshot.project_snapshot.send "period#{index}_param"
+    date=snapshot.project_snapshot.send "period#{index}_date"
+
+    if mode
+      if mode=='days'
+        label = message('added_over_x_days', :params => mode_param.to_s)
+      elsif mode=='version'
+        label = message('added_since_version', :params => mode_param.to_s)
+      elsif mode=='previous_analysis'
+        if !date.nil?
+          label = message('added_since_previous_analysis_detailed', :params => date.strftime("%Y %b. %d").to_s)
+        else
+          label = message('added_since_previous_analysis')
+        end
+      elsif mode=='previous_version'
+        unless mode_param.nil?
+          label = message('added_since_previous_version_detailed', :params => mode_param.to_s)
+        else
+          label = message('added_since_previous_version')
+        end
+      elsif mode=='date'
+        label = message('added_since', :params => date.strftime("%Y %b %d").to_s)
+      end
+      if label
+        selected=(params[:period]==index.to_s ? 'selected' : '')
+        "<option value='#{index}' #{selected}>#{label}</option>"
+      end
+    else
+      nil
+    end
 
   end
 
   def measure_or_variation_value(measure)
-	if measure
-	  @period_index ? measure.variation(@period_index) : measure.value
-	else
-	  nil
-	end
+    if measure
+      @period_index ? measure.variation(@period_index) : measure.value
+    else
+      nil
+    end
   end
 
   def switch_to_widget_resource(widget)
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb
index b608b9fae2b..1d303e9541a 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb
@@ -72,6 +72,8 @@ module FiltersHelper
   def period_name(property)
     if property=='previous_analysis'
       message('delta_since_previous_analysis')
+    elsif property=='previous_version'
+      message('delta_since_previous_version')
     elsif property =~ /^[\d]+(\.[\d]+){0,1}$/
       # is integer
       message('delta_over_x_days', :params => property)