SONAR-4495 Fallback to select first category for project settings too

1 files changed, 6 insertions, 1 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 9323122e01f..e7fef2f9573 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
@@ -253,9 +253,14 @@ class ProjectController < ApplicationController
 
     not_found('category') unless @categories.include? @category
 
-    @subcategory = params[:subcategory] || @category
     @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_subcategory =
+      @subcategories_per_categories[@category].nil? ? nil :
+        ((@subcategories_per_categories[@category].include? @category) ? @category : @subcategories_per_categories[@category][0])
+    @subcategory = params[:subcategory] || default_subcategory
+
     @definitions = definitions_per_category[@category] || {}
     @definitions = @definitions[@subcategory] || []
   end