diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2016-01-13 17:30:03 +0100 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2016-01-13 17:30:03 +0100 |
| commit | 4e0968c8f845c9a7c0ac766277bcf69377fcb48b (patch) | |
| tree | ad469ce9a53ad0f4ad183102f33ca19050ef4e9a /server | |
| parent | d4c45d72c0d3607c86ac4dbbbee53b07f8d69155 (diff) | |
| download | sonarqube-4e0968c8f845c9a7c0ac766277bcf69377fcb48b.tar.gz sonarqube-4e0968c8f845c9a7c0ac766277bcf69377fcb48b.zip | |
SONAR-7107 On modules, the name of the quality gate can be wrong
Diffstat (limited to 'server')
| -rw-r--r-- | server/sonar-server/src/main/resources/org/sonar/server/dashboard/widget/description.html.erb | 3 | ||||
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/views/overview/index.html.erb | 3 |
2 files changed, 4 insertions, 2 deletions
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 6d587793407..b24855c256f 100644 --- 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 f81ae58beb3..43d4cedebee 100644 --- 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 |