aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2013-07-19 17:05:29 +0200
committerJulien HENRY <julien.henry@sonarsource.com>2013-07-19 17:06:34 +0200
commit381f5df9785d00e38e4155bfd4c1dc3840dde989 (patch)
tree4cb77c69a2032d72439327cec342bf170af99d25 /sonar-server
parent1fd47ad08d0c1bcbfac4f7c81bc13485898bf2f0 (diff)
downloadsonarqube-381f5df9785d00e38e4155bfd4c1dc3840dde989.tar.gz
sonarqube-381f5df9785d00e38e4155bfd4c1dc3840dde989.zip
Fix regression on project settings (was switched to load global settings after update)
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/controllers/settings_controller.rb2
1 files changed, 1 insertions, 1 deletions
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 a1c8b353fab..3e03a23a605 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
@@ -98,7 +98,7 @@ class SettingsController < ApplicationController
end
def load_properties
- definitions_per_category = java_facade.propertyDefinitions.propertiesByCategory(nil)
+ definitions_per_category = java_facade.propertyDefinitions.propertiesByCategory(@resource.nil? ? nil : @resource.qualifier)
processProperties(definitions_per_category)
end