From 046c6519475f26ef6bf9b6f177c644a491311424 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Thu, 14 Jan 2016 14:52:25 +0100 Subject: [PATCH] SONAR-4610 Highlight product name in red when license details do not match product --- .../app/views/settings/_type_LICENSE.html.erb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb index 346c555d249..b28e4cd0efc 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/settings/_type_LICENSE.html.erb @@ -3,6 +3,10 @@ <% else license = controller.java_facade.parseLicense(value) + product = license.getProduct() || '-' + # super-hack here + # should be avoided in the future + does_product_match = property.key == "sonar.#{product}.license.secured" %>
@@ -10,8 +14,8 @@
- - + + @@ -43,7 +47,7 @@ <%= license.getServer() -%> <% else %> <%= license.getServer() || '-' -%> - <% end %> + <% end %> <% license.additionalProperties().each do |k,v| -%> @@ -55,4 +59,4 @@
Product:<%= license.getProduct() || '-' -%>Product:<%= product -%>
Organization:
-<% end %> \ No newline at end of file +<% end %> -- 2.39.5