diff options
| author | David Gageot <david@gageot.net> | 2012-05-08 11:23:40 +0200 |
|---|---|---|
| committer | David Gageot <david@gageot.net> | 2012-05-08 11:23:40 +0200 |
| commit | b8e4570d53b41f7bbb1ccba84e5950c0ce89f937 (patch) | |
| tree | cb63607b501b5461b366354d78956ed36620d910 | |
| parent | 9e46b4bb203a60742f0cb58cd621a58496b7ed33 (diff) | |
| download | sonarqube-b8e4570d53b41f7bbb1ccba84e5950c0ce89f937.tar.gz sonarqube-b8e4570d53b41f7bbb1ccba84e5950c0ce89f937.zip | |
Revert "SONAR-1927 Filters should be in the Administration Section" because it breaks IT tests.
This should be implemented only after the filter migration is done
This reverts commit 6235e6d68c1583e16229b38f7c789b57181721a9.
3 files changed, 5 insertions, 5 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb index cd8b289a093..d712c13a75a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/filters_controller.rb @@ -22,7 +22,7 @@ class FiltersController < ApplicationController helper MetricsHelper helper FiltersHelper - SECTION=Navigation::SECTION_CONFIGURATION + SECTION=Navigation::SECTION_HOME verify :method => :post, :only => [:create, :delete, :up, :down, :activate, :deactivate, :up_column, :down_column, :add_column, :delete_column, :set_sorted_column, :set_view, :set_columns, :set_page_size], :redirect_to => {:action => :index} before_filter :load_active_filters, :except => ['admin_console', 'treemap', 'set_view', 'set_columns'] diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb index a7e72fe5e17..9c1d3a854c8 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb @@ -35,6 +35,8 @@ <div id="sidebar"> <ul> <% if selected_section==Navigation::SECTION_HOME %> + <li class="<%= 'selected' if controller.controller_path=='filters' -%>"> + <a href="<%= ApplicationController.root_context -%>/filters/index"><%= message('filters.page') -%></a></li> <li class="<%= 'selected' if controller.controller_path=='reviews' -%>"> <a href="<%= ApplicationController.root_context -%>/reviews/index"><%= message('reviews.page') -%></a></li> <li class="<%= 'selected' if controller.controller_path=='dependencies' -%>"> @@ -123,8 +125,6 @@ <a href="<%= ApplicationController.root_context -%>/metrics/index"><%= message('manual_metrics.page') -%></a></li> <li class="<%= 'selected' if controller.controller_path=='manual_rules' -%>"> <a href="<%= ApplicationController.root_context -%>/manual_rules/index"><%= message('manual_rules.page') -%></a></li> - <li class="<%= 'selected' if controller.controller_path=='filters' -%>"> - <a href="<%= ApplicationController.root_context -%>/filters/index"><%= message('filters.page') -%></a></li> <li class="<%= 'selected' if controller.controller_path=='admin_filters' -%>"> <a href="<%= ApplicationController.root_context -%>/admin_filters/index"><%= message('default_filters.page') -%></a></li> <li class="<%= 'selected' if controller.controller_path=='admin_dashboards' -%>"> diff --git a/sonar-server/src/main/webapp/WEB-INF/config/routes.rb b/sonar-server/src/main/webapp/WEB-INF/config/routes.rb index a824b23cf52..f10a537e29a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/config/routes.rb +++ b/sonar-server/src/main/webapp/WEB-INF/config/routes.rb @@ -34,8 +34,8 @@ ActionController::Routing::Routes.draw do |map| map.resources 'properties', :path_prefix => 'api', :controller => 'api/properties', :requirements => { :id => /.*/ } # home page - map.home '', :controller => 'reviews', :action => 'index' - map.root :controller => 'reviews', :action => 'index' + map.home '', :controller => 'filters', :action => 'index' + map.root :controller => 'filters', :action => 'index' # page plugins map.connect 'plugins/configuration/:page', :controller => 'plugins/configuration', :action => 'index', :requirements => { :page => /.*/ } |