SONAR-3159 Fix project settings with subcategories

and remove subcategory attribute from annotation

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/Property.java b/sonar-plugin-api/src/main/java/org/sonar/api/Property.java
index 93cf94c1b526fb1808f03f51500edfacfbd4caa4..eef51d6df6960aa664aa91290287652e3d85335f 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/Property.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/Property.java
@@ -65,11 +65,6 @@ public @interface Property {
    */
   String category() default "";
 
-  /**
-   * @since 3.6
-   */
-  String subcategory() default "default";
-
   /**
    * Is the property displayed in project settings page ?
    */

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
index e4dedb47d4f6c39ce6ecbbf055df615b5e26d5c0..7a894739d8c8f8ef2edc38ae78287c81f5fff21f 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
@@ -107,7 +107,6 @@ public final class PropertyDefinition implements BatchExtension, ServerExtension
         .global(annotation.global())
         .qualifiers(qualifiers)
         .category(annotation.category())
-        .subcategory(annotation.subcategory())
         .type(annotation.type())
         .options(annotation.options())
         .multiValues(annotation.multiValues())

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 a947f8940c8597dafcc98d76cd3a8545d53bbd1b..156d918c9cba8ce5f862158e2c7c83bc7fef12bb 100644 (file)
--- 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