aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server/src/main/webapp/WEB-INF/app/controllers
diff options
context:
space:
mode:
authorsimonbrandhof <simon.brandhof@gmail.com>2010-12-10 17:56:55 +0000
committersimonbrandhof <simon.brandhof@gmail.com>2010-12-10 17:56:55 +0000
commitddbaf492be30974ce54995ce0927d598e4128552 (patch)
tree44c501e0dde9d05976f51ee02580a5d0f405f33d /sonar-server/src/main/webapp/WEB-INF/app/controllers
parent9dcf2f2c45ec1ce16ea78a489d78e026634ed2fb (diff)
downloadsonarqube-ddbaf492be30974ce54995ce0927d598e4128552.tar.gz
sonarqube-ddbaf492be30974ce54995ce0927d598e4128552.zip
SONAR-1956 support variations in treemaps
Diffstat (limited to 'sonar-server/src/main/webapp/WEB-INF/app/controllers')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb
index 69644b74a1f..d1be0ad873e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb
@@ -333,7 +333,8 @@ class FiltersController < ApplicationController
filter.columns.clear
params[:columns].each do |colstring|
- filter.columns<<::FilterColumn.create_from_string(colstring)
+ column=::FilterColumn.create_from_string(colstring)
+ filter.columns<<column if column
end
filter.save
redirect_to :action => :edit, :id => filter.id
@@ -406,7 +407,9 @@ class FiltersController < ApplicationController
@width=(params[:width]||'800').to_i
@height=(params[:height]||'500').to_i
- @treemap=Sonar::Treemap.new(@filter_context.measures_by_snapshot, @width, @height, @size_metric, @color_metric)
+
+ treemap_options={:variation_index => @filter_context.variation_index}
+ @treemap=Sonar::Treemap.new(@filter_context.measures_by_snapshot, @width, @height, @size_metric, @color_metric, treemap_options)
render :action => "treemap", :layout => false
end