From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 22 Dec 2014 12:23:50 +0000 (+0100)
Subject: Fix display of debt characteristic in the issue rule modal
X-Git-Tag: 5.0-RC4~25
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=71bb66f08acd61eecbf089e8b813615fee531eb7;p=sonarqube.git

Fix display of debt characteristic in the issue rule modal
---

diff --git a/server/sonar-web/src/main/coffee/issue/views/rule-overlay.coffee b/server/sonar-web/src/main/coffee/issue/views/rule-overlay.coffee
index 7d7d8aad88d..78415e338e0 100644
--- a/server/sonar-web/src/main/coffee/issue/views/rule-overlay.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/rule-overlay.coffee
@@ -13,3 +13,4 @@ define [
     serializeData: ->
       _.extend super,
         permalink: "#{baseUrl}/coding_rules#rule_key=#{@model.get('key')}"
+        allTags: _.union @model.get('sysTags'), @model.get('tags')
diff --git a/server/sonar-web/src/main/hbs/issue/issue-rule.hbs b/server/sonar-web/src/main/hbs/issue/issue-rule.hbs
index 4f4e0bdc932..cee912e9594 100644
--- a/server/sonar-web/src/main/hbs/issue/issue-rule.hbs
+++ b/server/sonar-web/src/main/hbs/issue/issue-rule.hbs
@@ -7,6 +7,17 @@
 
 <span class="subtitle">{{key}}</span>
 
+<ul class="coding-rules-detail-properties">
+  <li class="coding-rules-detail-property coding-rules-detail-tag-list">
+    <i class="icon-tags"></i>
+    <span>{{#if allTags}}{{join allTags ', '}}{{else}}{{t 'coding_rules.no_tags'}}{{/if}}</span>
+  </li>
+  {{#if debtCharName}}
+    <li class="coding-rules-detail-property">{{debtCharName}}{{#if debtSubCharName}} > {{debtSubCharName}}{{/if}}</li>
+  {{/if}}
+</ul>
+
+
 <div class="coding-rules-detail-description rule-desc markdown">{{{htmlDesc}}}</div>
 
 <div class="modal-foot">
diff --git a/server/sonar-web/src/main/hbs/issues/issues-help.hbs b/server/sonar-web/src/main/hbs/issues/issues-help.hbs
index 4745f8882b4..75fae5d8ee8 100644
--- a/server/sonar-web/src/main/hbs/issues/issues-help.hbs
+++ b/server/sonar-web/src/main/hbs/issues/issues-help.hbs
@@ -14,7 +14,7 @@
   <ul>
     <li><span class="shortcut-button">c</span> &nbsp;&nbsp; to confirm/unconfirm</li>
     <li><span class="shortcut-button">r</span> &nbsp;&nbsp; to resolve/reopen</li>
-    <li><span class="shortcut-button">f</span> &nbsp;&nbsp; to mark as false-positive</li>
+    <li><span class="shortcut-button">f</span> &nbsp;&nbsp; to mark as false positive</li>
     <li><span class="shortcut-button">a</span> &nbsp;&nbsp; to assign</li>
     <li><span class="shortcut-button">m</span> &nbsp;&nbsp; to assign to the current user</li>
     <li><span class="shortcut-button">p</span> &nbsp;&nbsp; to plan</li>