diff options
| author | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2015-09-22 13:18:30 +0200 |
|---|---|---|
| committer | Duarte Meneses <duarte.meneses@sonarsource.com> | 2015-09-30 16:27:12 +0200 |
| commit | be56575b34b2d16d3486a754145a2478908765fe (patch) | |
| tree | ffe75f8c04edc44fec19bea1f75e8ae2d73aa14e /server/sonar-web/src/main/webapp | |
| parent | 806c04edb2169d2523225bf67e32729b20bf0ef2 (diff) | |
| download | sonarqube-be56575b34b2d16d3486a754145a2478908765fe.tar.gz sonarqube-be56575b34b2d16d3486a754145a2478908765fe.zip | |
Fix WS suffix management
Diffstat (limited to 'server/sonar-web/src/main/webapp')
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/java_ws_controller.rb | 2 | ||||
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/lib/java_ws_routing.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/java_ws_controller.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/java_ws_controller.rb index 7ee7e580709..1855d30d915 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/java_ws_controller.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/java_ws_controller.rb @@ -49,7 +49,7 @@ class Api::JavaWsController < Api::ApiController def skip_authentication_check_for_batch - (params[:wspath]=='batch' && params[:wsaction]=='index') || (params[:wspath]=='batch' && params[:wsaction]=='file') + (params[:wspath]=='scanner' && params[:wsaction]=='index') || (params[:wspath]=='scanner' && params[:wsaction]=='file') end end diff --git a/server/sonar-web/src/main/webapp/WEB-INF/lib/java_ws_routing.rb b/server/sonar-web/src/main/webapp/WEB-INF/lib/java_ws_routing.rb index 741cce8bf45..258de4f5b4a 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/lib/java_ws_routing.rb +++ b/server/sonar-web/src/main/webapp/WEB-INF/lib/java_ws_routing.rb @@ -34,6 +34,7 @@ module ActionController ws_engine.controllers().each do |controller| controller.actions.each do |action| if (!action.handler().java_kind_of?(Java::OrgSonarApiServerWs::RailsHandler)) + prepend_route("#{controller.path()}/#{action.key()}.:format/:id", {:controller => 'api/java_ws', :action => 'index', :wsaction => action.key(), :wspath => controller.path()}) prepend_route("#{controller.path()}/#{action.key()}/:id", {:controller => 'api/java_ws', :action => 'index', :wsaction => action.key(), :wspath => controller.path()}) if action.key()=='index' prepend_route("#{controller.path()}", {:controller => 'api/java_ws', :action => 'index', :wsaction => action.key(), :wspath => controller.path()}) |