diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2013-04-22 10:32:06 +0200 |
|---|---|---|
| committer | Julien HENRY <julien.henry@sonarsource.com> | 2013-04-22 10:33:11 +0200 |
| commit | 70bbfa0e5c8d518ff19f34fc1f66bc0c3481b491 (patch) | |
| tree | 7eba21dfff4da5a50926dcb60a62d2c3274eff9c /sonar-server | |
| parent | cabc96936712cf0a22885507c56d5a0463ff76eb (diff) | |
| download | sonarqube-70bbfa0e5c8d518ff19f34fc1f66bc0c3481b491.tar.gz sonarqube-70bbfa0e5c8d518ff19f34fc1f66bc0c3481b491.zip | |
SONAR-3159 Fix project settings with subcategories
and remove subcategory attribute from annotation
Diffstat (limited to 'sonar-server')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb index a947f8940c8..156d918c9cb 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb @@ -243,7 +243,12 @@ class ProjectController < ApplicationController default_category = nil default_category = @categories[0] if !@categories.empty? @category = params[:category] || default_category - @definitions = definitions_per_category[@category] || [] + + @subcategory = params[:subcategory] || 'default' + @subcategories_per_categories = {} + definitions_per_category.each {|category, definitions_per_subcategories| @subcategories_per_categories.store(category, by_subcategory_name(category, definitions_per_subcategories.keys - ['default'])) } + @definitions = definitions_per_category[@category] || {} + @definitions = @definitions[@subcategory] || [] not_found('category') unless @categories.include? @category end @@ -395,4 +400,4 @@ class ProjectController < ApplicationController redirect_to home_path end -end
\ No newline at end of file +end |