SONAR-7107 On modules, the name of the quality gate can be wrong

diff --git a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/description.html.erb b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/description.html.erb
index 6d5877934072b665f27f6ffd9c238b2f9ffe2f94..b24855c256f1f9e13532f514e0499ccc275c937e 100644 (file)
--- a/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/description.html.erb
+++ b/server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/description.html.erb
@@ -47,7 +47,8 @@
   <%
      unless @resource.qualifier == 'DEV' or @resource.qualifier == 'VW' or @resource.qualifier == 'SVW'
        using_default=false
-       quality_gate=Property.value('sonar.qualitygate', @resource && @resource.id, nil)
+       root = @resource.root_project
+       quality_gate=Property.value('sonar.qualitygate', root.id, nil)
        unless quality_gate
          quality_gate=Property.value('sonar.qualitygate', nil, nil)
          using_default=false || quality_gate

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/overview/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/overview/index.html.erb
index f81ae58beb355ed7b581368182dbd09956dd792d..43d4cedebee04d9e46c4d2ef67ec161094db113b 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/overview/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/overview/index.html.erb
@@ -12,7 +12,8 @@
 
    is_gate_default = false
    gate = nil
-   gate_id = Property.value('sonar.qualitygate', @resource && @resource.id, nil)
+   root = @resource.root_project
+   gate_id = Property.value('sonar.qualitygate', root.id, nil)
    unless gate_id
      gate_id=Property.value('sonar.qualitygate', nil, nil)
      is_gate_default = false || gate_id