From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 5 May 2015 09:26:04 +0000 (+0200)
Subject: SONAR-6265 apply feedback
X-Git-Tag: 5.2-RC1~2053
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d11386b5a2b4223ee5038db9bf8fc7effbf29185;p=sonarqube.git

SONAR-6265 apply feedback
---

diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-rule-filter-form.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-rule-filter-form.hbs
index 1a414836868..35f896c0264 100644
--- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-rule-filter-form.hbs
+++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-rule-filter-form.hbs
@@ -5,6 +5,26 @@
     {{langName}}
   </a>
 
+  {{#if severity}}
+    <a href="#" class="issue-action-option" data-property="severities" data-value="{{severity}}">
+      {{severityHelper severity}}
+    </a>
+  {{/if}}
+
+  {{#if debtChar}}
+    <hr>
+
+    <a href="#" class="issue-action-option" data-property="debt_characteristics" data-value="{{debtChar}}">
+      {{debtCharName}}
+    </a>
+
+    {{#if debtSubChar}}
+      <a href="#" class="issue-action-option" data-property="debt_characteristics" data-value="{{debtSubChar}}">
+        {{debtSubCharName}}
+      </a>
+    {{/if}}
+  {{/if}}
+
   {{#notEmpty tags}}
     <hr>
     {{#each tags}}
diff --git a/server/sonar-web/src/main/hbs/issue/issue.hbs b/server/sonar-web/src/main/hbs/issue/issue.hbs
index 0e63dcbdeed..dc47a49ddb9 100644
--- a/server/sonar-web/src/main/hbs/issue/issue.hbs
+++ b/server/sonar-web/src/main/hbs/issue/issue.hbs
@@ -35,10 +35,10 @@
           <div class="issue-meta">
             {{#inArray actions "set_severity"}}
               <a class="issue-action issue-action-with-options js-issue-set-severity">
-                <span class="issue-meta-label">{{severity severity}}</span>&nbsp;<i class="icon-dropdown"></i>
+                <span class="issue-meta-label">{{severityHelper severity}}</span>&nbsp;<i class="icon-dropdown"></i>
               </a>
             {{else}}
-              {{severity severity}}
+              {{severityHelper severity}}
             {{/inArray}}
           </div>
 
diff --git a/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-issues.hbs b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-issues.hbs
index 88a406859da..29f14e826df 100644
--- a/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-issues.hbs
+++ b/server/sonar-web/src/main/hbs/source-viewer/measures/_source-viewer-measures-issues.hbs
@@ -20,7 +20,7 @@
       <div class="measures-list">
         {{#each issuesFacets.severities}}
           <div class="measure measure-one-line measure-with-bar">
-            <span class="measure-name">{{severity val}}</span>
+            <span class="measure-name">{{severityHelper val}}</span>
             <span class="measure-value">{{count}}</span>
             <span class="measure-bar">
               <span class="measure-bar-inner measure-bar-inner-{{val}}"
diff --git a/server/sonar-web/src/main/js/coding-rules/controller.js b/server/sonar-web/src/main/js/coding-rules/controller.js
index d8aa0bb3c62..8d37ad5a043 100644
--- a/server/sonar-web/src/main/js/coding-rules/controller.js
+++ b/server/sonar-web/src/main/js/coding-rules/controller.js
@@ -27,7 +27,8 @@ define([
 
   return Controller.extend({
     pageSize: 200,
-    ruleFields: ['name', 'lang', 'langName', 'sysTags', 'tags', 'status'],
+    ruleFields: ['name', 'lang', 'langName', 'sysTags', 'tags', 'status', 'severity',
+                 'debtChar', 'debtCharName', 'debtSubChar', 'debtSubCharName'],
 
 
     _searchParameters: function () {
diff --git a/server/sonar-web/src/main/js/common/handlebars-extensions.js b/server/sonar-web/src/main/js/common/handlebars-extensions.js
index 83826c5de35..2ad4f37af99 100644
--- a/server/sonar-web/src/main/js/common/handlebars-extensions.js
+++ b/server/sonar-web/src/main/js/common/handlebars-extensions.js
@@ -53,7 +53,7 @@
     );
   });
 
-  Handlebars.registerHelper('severity', function (severity) {
+  Handlebars.registerHelper('severityHelper', function (severity) {
     return new Handlebars.SafeString(
         '<i class="icon-severity-' + severity.toLowerCase() + '"></i>&nbsp;' + t('severity', severity)
     );
diff --git a/server/sonar-web/src/test/js/coding-rules-page-spec.js b/server/sonar-web/src/test/js/coding-rules-page-spec.js
index aedc9368686..37e78197596 100644
--- a/server/sonar-web/src/test/js/coding-rules-page-spec.js
+++ b/server/sonar-web/src/test/js/coding-rules-page-spec.js
@@ -93,7 +93,6 @@ casper.test.begin(testName('Filter Similar Rules'), 3, function (test) {
       .start(lib.buildUrl('coding-rules'), function () {
         lib.setDefaultViewport();
 
-
         lib.mockRequestFromFile('/api/rules/app', 'app.json');
         lib.mockRequestFromFile('/api/rules/search', 'search-sql-tag.json', { data: { tags: 'sql' } });
         lib.mockRequestFromFile('/api/rules/search', 'search.json');
@@ -120,7 +119,6 @@ casper.test.begin(testName('Filter Similar Rules'), 3, function (test) {
         test.assertExists('.bubble-popup [data-property="languages"][data-value="java"]');
 
         casper.click('.bubble-popup [data-property="tags"][data-value="sql"]');
-        casper.wait(1000, function () { lib.capture(); });
         casper.waitForSelectorTextChange('#coding-rules-total');
       })