SONAR-4032 Display first category (by alpha) on settings page

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb
index 0c6084981ac6d300218472d2f5551401c49130e5..dc8ab3d5d6d5e234c38608af8d5f4d4b49c4979c 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/application_controller.rb
@@ -201,4 +201,15 @@ class ApplicationController < ActionController::Base
     @breadcrumbs ||= []
     @breadcrumbs.concat(breadcrumbs)
   end
+
+  #
+  # SETTINGS
+  #
+  def by_category_name(categories)
+    Api::Utils.insensitive_sort(categories) { |category| category_name(category) }
+  end
+
+  def category_name(category)
+    message("property.category.#{category}", :default => category)
+  end
 end

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 4873c94eea327525fa38820d2eb6f1165866c0ea..9fb949e96b7972cdaabb6228fd8b3f4ee4a1bbee 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
@@ -245,9 +245,10 @@ class ProjectController < ApplicationController
     end
 
     @categories = definitions_per_category.keys
+    @categories = by_category_name(@categories)
+
     default_category = nil
-    default_category = 'general' if @categories.include? 'general'
-    default_category ||= @categories[0]
+    default_category = @categories[0] if !@categories.empty?
     @category = params[:category] || default_category
     @definitions = definitions_per_category[@category] || []
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/settings_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/settings_controller.rb
index 84a619fb413e81d8648267f51087d0de3d0104c8..268f3e06c53a9ace5a187963470a42bb95259167 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/settings_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/settings_controller.rb
@@ -100,8 +100,6 @@ class SettingsController < ApplicationController
   end
 
   def load_properties
-    @category = params[:category] || 'general'
-
     if @resource.nil?
       definitions_per_category = java_facade.propertyDefinitions.globalPropertiesByCategory
     elsif @resource.project?
@@ -111,6 +109,11 @@ class SettingsController < ApplicationController
     end
 
     @categories = definitions_per_category.keys + SPECIAL_CATEGORIES
+    @categories = by_category_name(@categories)
+
+    default_category = nil
+    default_category = @categories[0] if !@categories.empty?
+    @category = params[:category] || default_category
     @definitions = definitions_per_category[@category] || []
 
     not_found('category') unless @categories.include? @category

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb
index 4ad4d3b3687ee6100af9994b5d7ed52a29a23562..f019fdc4ff14501449e972b952a06c1ea1c248f6 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb
@@ -77,10 +77,6 @@ module SettingsHelper
     property.getType()
   end
 
-  def by_category_name(categories)
-    Api::Utils.insensitive_sort(categories) { |category| category_name(category) }
-  end
-
   def by_property_name(properties)
     Api::Utils.insensitive_sort(properties) { |property| property_name(property) }
   end

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb
index 46e7c6ea3d17a39398544c581c9132227aa57d6d..ca7f2297df417f6df4f29ebd02f2f23063f59222 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb
@@ -11,7 +11,7 @@
           </tr>
           </thead>
           <tbody>
-          <% by_category_name(@categories).each do |category| -%>
+          <% @categories.each do |category| -%>
             <tr id="select_<%= category -%>" class="select <%= cycle('even', 'odd', :name => 'category') -%> <%= 'selected' if @category==category -%>">
               <td><%= link_to category_name(category), :category => category -%></td>
             </tr>