SONAR-1569 Case sensitive sorting of components on the Dependencies page

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb
index 904ce38b06911ad594b57a307a46683f0b8d7fe6..a3c03b63086e7cc372a5b5c1cd54d8cb1a97607a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb
@@ -42,13 +42,15 @@ class DependenciesController < ApplicationController
       # load all the resources (first column)
       #
       @resources=Project.find(:all,
-        :conditions => ["scope=? AND qualifier IN (?) AND enabled=? AND (UPPER(name) like ? OR kee like ?)", 'PRJ', QUALIFIERS, true, "%#{@search.upcase}%", "%#{@search}%"], :order => 'name')
+        :conditions => ["scope=? AND qualifier IN (?) AND enabled=? AND (UPPER(name) like ? OR kee like ?)", 'PRJ', QUALIFIERS, true, "%#{@search.upcase}%", "%#{@search}%"])
+      Api::Utils.insensitive_sort!(@resources){|r| r.name}
 
       if params[:resource]
         @resource=@resources.select{|r| r.kee==params[:resource]}.first
       elsif @resources.size==1
         @resource=@resources.first
       end
+
     end
 
     if @resource
@@ -85,7 +87,7 @@ class DependenciesController < ApplicationController
       project_sids=deps.map{|dep| dep.project_snapshot_id}.compact.uniq[0..950]  # oracle issue with more than 1000 IN elements. Not annoying to truncate hundreds of results...
       if project_sids.size>0
         @project_snapshots=Snapshot.find(:all, :include => 'project', :conditions => ['id IN (?) AND islast=? AND status=?', project_sids, true, 'P'])
-        @project_snapshots.sort! {|x,y| x.project.name <=> y.project.name }
+        Api::Utils.insensitive_sort!(@project_snapshots) {|s| s.project.name}
       else
         @project_snapshots=[]
       end

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb
index 286578434aef71f274a4c50d823763cee3c5bdd7..0535341e2ca9d27e51fd21bad21cfab7a57ead60 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb
@@ -1,7 +1,7 @@
 <style>
 .drilldown_col {
   float: left;
-  margin: 10px 15px 15px 0;
+  margin: 10px 5px 15px 0;
 }
 .drilldown_col div.col {
 max-height: 35em;