SONAR-1913: Property renamed to "sonar.updatecenter.activate".

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb
index be17f0b9b4c63ead5fcf3b74a12116f669e5a71a..6a84b0fa6348f63455b3d3de0effb20c789acb46 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/updatecenter_controller.rb
@@ -124,7 +124,7 @@ class UpdatecenterController < ApplicationController
   end
   
   def updatecenter_activated
-    update_center_activated = java_facade.getConfigurationValue('sonar.updatecenter') || 'true';
+    update_center_activated = java_facade.getConfigurationValue('sonar.updatecenter.activate') || 'true';
     if update_center_activated!='true'
       redirect_to home_url
     end

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 a617eaec8730396c8ee5c06901e986a18bf6126c..e223270877a7b4cfcab0a72ab3353e0161d90ad1 100644 (file)
--- 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
@@ -76,7 +76,7 @@
               <li class="<%= 'selected' if request.request_uri.include?('/settings') -%>"><a href="<%= ApplicationController.root_context -%>/settings/index">Settings</a></li>
               <li class="<%= 'selected' if controller.controller_path=='backup' -%>"><a href="<%= ApplicationController.root_context -%>/backup">Backup</a></li>
               <li class="<%= 'selected' if controller.controller_path=='system' -%>"><a href="<%= ApplicationController.root_context -%>/system">System info</a></li>
-              <% update_center_activated = controller.java_facade.getConfigurationValue('sonar.updatecenter') || 'true';
+              <% update_center_activated = controller.java_facade.getConfigurationValue('sonar.updatecenter.activate') || 'true';
               if update_center_activated=='true' %>
                 <li class="<%= 'selected' if controller.controller_path=='updatecenter' -%>"><a href="<%= ApplicationController.root_context -%>/updatecenter">Upgrades (BETA)</a></li>
               <% end %>