SONAR-5083 SONAR-5112 Add placeholder for WORK_DUR and RATING fields

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_condition_template.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_condition_template.hbs.erb
index 7ca5001604062dfc2bef49ed10bdd0c2935cfcee..3a4b2a5821ce0292dbe30e36f20cc4e3ee1adb87 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_condition_template.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_condition_template.hbs.erb
@@ -28,7 +28,7 @@
   <td width="15%" nowrap="nowrap">
     <i class="icon-alert-warn" title="{{t 'alerts.warning_tooltip'}}"></i>
     {{#if canEdit}}
-      <input name="warning" class="measure-input" data-type="{{metric.type}}" type="text">
+      <input name="warning" class="measure-input" data-type="{{metric.type}}" placeholder="{{metric.placeholder}}" type="text">
     {{else}}
       {{warning}}
     {{/if}}
@@ -36,7 +36,7 @@
   <td width="15%" nowrap="nowrap">
     <i class="icon-alert-error" title="{{t 'alerts.error_tooltip'}}"></i>
     {{#if canEdit}}
-      <input name="error" class="measure-input" data-type="{{metric.type}}" type="text">
+      <input name="error" class="measure-input" data-type="{{metric.type}}" placeholder="{{metric.placeholder}}" type="text">
     {{else}}
       {{error}}
     {{/if}}

diff --git a/sonar-server/src/main/webapp/javascripts/navigator/filters/metric-filters.js b/sonar-server/src/main/webapp/javascripts/navigator/filters/metric-filters.js
index b97c557654f7cede8c58ab43b24b80cdaa728575..f680d0e06e14678d1a4e860559818dd3b7fcd572 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/navigator/filters/metric-filters.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/filters/metric-filters.js
@@ -31,6 +31,14 @@ define(['navigator/filters/base-filters', 'common/handlebars-extensions'], funct
       });
       if (metric) {
         this.$('[name=val]').data('type', metric.metric.val_type);
+        switch (metric.metric.val_type) {
+            case 'WORK_DUR':
+                this.$('[name=val]').prop('placeholder', '1d 7h 59min');
+                break;
+            case 'RATING':
+                this.$('[name=val]').prop('placeholder', 'A');
+                break;
+        }
       }
     },
 

diff --git a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.coffee b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.coffee
index 4ca7cdc15b87fe4a31fb5f5171c7aea5c28857cd..50992789af043e427efaa5bf4d2b0579e94c0b7d 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.coffee
+++ b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.coffee
@@ -41,6 +41,10 @@ define [
     populateMetric: ->
       metricKey = @model.get('metric')
       metric = _.findWhere @options.app.metrics, key: metricKey
+      if metric?
+        switch metric.type
+          when 'WORK_DUR' then metric.placeholder = '1d 7h 59min'
+          when 'RATING' then metric.placeholder = 'A'
       @model.set { metric: metric }, { silent: true }
       @model.set { isDiffMetric: metric.key.indexOf('new_') == 0 }, { silent: true }
 

diff --git a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js
index f1f741f7e19bbe1992a50c49dc111b0fb5db8b0a..fba38b1ca8f620084813b62d50c8dab1ab522efd 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js
+++ b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js
@@ -51,6 +51,15 @@
         metric = _.findWhere(this.options.app.metrics, {
           key: metricKey
         });
+        if (metric != null) {
+          switch (metric.type) {
+            case 'WORK_DUR':
+              metric.placeholder = '1d 7h 59min';
+              break;
+            case 'RATING':
+              metric.placeholder = 'A';
+          }
+        }
         this.model.set({
           metric: metric
         }, {