aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2016-02-05 16:42:01 +0100
committerTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2016-02-05 16:42:01 +0100
commit1449392c14eb07763558094a47c4f88e4ac71df2 (patch)
tree066ea572ff1c288c2be44c0ff2342a763fe5e3a1 /server
parenta79ba66e5a40f4c7931da67b8a90f0f13bd25f18 (diff)
downloadsonarqube-1449392c14eb07763558094a47c4f88e4ac71df2.tar.gz
sonarqube-1449392c14eb07763558094a47c4f88e4ac71df2.zip
SONAR-7070 Update leak label in quality gate management
Diffstat (limited to 'server')
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java6
-rw-r--r--server/sonar-web/src/main/js/apps/quality-gates/templates/quality-gate-detail-condition.hbs4
2 files changed, 4 insertions, 6 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java
index 50123dd2e02..fcbed4cfc72 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java
@@ -28,8 +28,6 @@ import org.sonar.api.utils.text.JsonWriter;
import org.sonar.core.timemachine.Periods;
import org.sonar.server.qualitygate.QualityGates;
-import static java.lang.String.format;
-
public class AppAction implements QGateWsAction {
private final QualityGates qualityGates;
@@ -64,11 +62,11 @@ public class AppAction implements QGateWsAction {
writer.prop("edit", qualityGates.currentUserHasWritePermission());
}
- private void addPeriods(JsonWriter writer) {
+ private static void addPeriods(JsonWriter writer) {
writer.name("periods").beginArray();
writer.beginObject()
.prop("key", 1L)
- .prop("text", format("over Leak Period (%s)", periods.label(1)))
+ .prop("text", "Leak")
.endObject();
writer.endArray();
}
diff --git a/server/sonar-web/src/main/js/apps/quality-gates/templates/quality-gate-detail-condition.hbs b/server/sonar-web/src/main/js/apps/quality-gates/templates/quality-gate-detail-condition.hbs
index b48a4b948cd..206b7ceb283 100644
--- a/server/sonar-web/src/main/js/apps/quality-gates/templates/quality-gate-detail-condition.hbs
+++ b/server/sonar-web/src/main/js/apps/quality-gates/templates/quality-gate-detail-condition.hbs
@@ -12,11 +12,11 @@
<option value="0" {{#eq period 0}}selected{{/eq}}>{{t 'value'}}</option>
{{/unless}}
{{#each periods}}
- <option value="{{key}}" {{#eq key ../period}}selected{{/eq}}>&Delta; {{text}}</option>
+ <option value="{{key}}" {{#eq key ../period}}selected{{/eq}}>{{text}}</option>
{{/each}}
</select>
{{else}}
- &Delta; {{periodText}}
+ {{periodText}}
{{/if}}
</td>