SONAR-6152 fix failures

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index cebf88db8fe1a43d7e4281a93475103d4ebff844..881b85429c94ac001ab6aba377cf5b85c5aa54ea 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -84,6 +84,11 @@ module ApplicationHelper
     Java::OrgSonarServerPlatform::Platform.getServer().getVersion()
   end
 
+  def property_value_by_key(key)
+    property = Property.by_key(key)
+    property.value if property
+  end
+
   # shortcut for the method is_admin?() without parameters. Result is kept in cache.
   def administrator?
     @is_administrator ||=

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb
index 29f5a5d9d2bbeed99ed992a34a8d2accba8273e0..be4bf396542b8e798adc879e6f2e29e9942f5b94 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb
@@ -80,10 +80,6 @@ module SettingsHelper
     end
   end
 
-  def property_by_key(key)
-    Property.by_key(key)
-  end
-
   # for backward-compatibility with properties that do not define the type TEXT
   def property_type(property, value)
     unless property.fields.blank?

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_global.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_global.html.erb
index 59860893d9df4098410f10ad7c673956ba1717c0..c41b43add156fcbde679ea1f60793c9e3fcb4e76 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_global.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_navbar_conf_global.html.erb
@@ -27,18 +27,18 @@
       <% end %>
     ],
     <%
-      logo_url = property_by_key('sonar.lf.logoUrl')
-      logo_width = property_by_key('sonar.lf.logoWidthPx')
+      logo_url = property_value_by_key('sonar.lf.logoUrl')
+      logo_width = property_value_by_key('sonar.lf.logoWidthPx')
     %>
     <%
       if logo_url
     %>
-    logoUrl: '<%= escape_javascript property_value(logo_url) -%>',
+    logoUrl: '<%= escape_javascript logo_url -%>',
     <% end %>
     <%
       if logo_width
     %>
-    logoWidth: '<%= escape_javascript property_value(logo_width) -%>'
+    logoWidth: '<%= escape_javascript logo_width -%>'
     <% end %>
   });
 </script>