summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties1
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/controllers/all_projects_controller.rb2
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb15
3 files changed, 3 insertions, 15 deletions
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 667718e805d..9b3b6d22c91 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -500,7 +500,6 @@ reviews.filtered_by.to=To date
#------------------------------------------------------------------------------
all-projects.cols.name=Name
-all-projects.cols.key=Key
#------------------------------------------------------------------------------
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/all_projects_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/all_projects_controller.rb
index 51bb0dace29..60c62124ae7 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/all_projects_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/all_projects_controller.rb
@@ -28,7 +28,7 @@ class AllProjectsController < ApplicationController
@filter = MeasureFilter.new
- @filter.criteria = params.merge({'qualifiers' => [@qualifier], 'cols' => ['name', 'description', 'key', 'links']})
+ @filter.criteria = params.merge({'qualifiers' => [@qualifier], :cols => ['name', 'description', 'links'], :sort => 'name'})
@filter.enable_default_display
@filter.execute(self, :user => current_user)
end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb
index a13cf47b8e4..892def6032b 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb
@@ -28,7 +28,7 @@
<%
display_favourites = logged_in?
- colspan = 7
+ colspan = 5
colspan += 1 if display_favourites
%>
@@ -38,20 +38,13 @@
<% if display_favourites %>
<th class="thin" style></th>
<% end %>
- <th class="thin">
+ <th class="thin nowrap">
<%= link_to_function( message('all-projects.cols.name'), "reloadParameters({asc:'#{(!@filter.sort_asc?).to_s}', sort:'name'})") -%>
<% if @filter.sort_key=='name' %>
<%= @filter.sort_asc? ? image_tag("asc12.png") : image_tag("desc12.png") -%>
<% end %>
</th>
<th></th>
- <th>
- <%= link_to_function( message('all-projects.cols.key'), "reloadParameters({asc:'#{(!@filter.sort_asc?).to_s}', sort:'key'})") -%>
- <% if @filter.sort_key=='key' %>
- <%= @filter.sort_asc? ? image_tag("asc12.png") : image_tag("desc12.png") -%>
- <% end %>
- </th>
- <th></th>
<th></th>
<th></th>
<th></th>
@@ -68,10 +61,6 @@
<%= qualifier_icon(result.snapshot)-%> <%= link_to(result.snapshot.resource.name(true), {:controller => 'dashboard', :id => result.snapshot.resource_id}, :title => result.snapshot.resource.key) -%>
</td>
<td class="sep"></td>
- <td class="nowrap">
- <span class='small'><%= result.snapshot.resource.kee -%></span>
- </td>
- <td class="sep"></td>
<td>
<%= h result.snapshot.resource.description -%>
</td>