From: Julien Lancelot <julien.lancelot@gmail.com>
Date: Thu, 10 Jan 2013 13:14:06 +0000 (+0100)
Subject: SONAR-4032 Display first category (by alpha) on settings page
X-Git-Tag: 3.5~425
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9a9f6a19010b546efd28d39fcf1061f4c43a2099;p=sonarqube.git

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 0c6084981ac..dc8ab3d5d6d 100644
--- 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 4873c94eea3..9fb949e96b7 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
@@ -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 84a619fb413..268f3e06c53 100644
--- 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 4ad4d3b3687..f019fdc4ff1 100644
--- 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 46e7c6ea3d1..ca7f2297df4 100644
--- 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>