From 1569b0af8f48b2268770c8b4a64def21694e8a0a Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Tue, 20 May 2014 15:51:47 +0200
Subject: [PATCH] SONAR-5007 Fix display of rule list, rule details, repository
 filter

---
 .../src/main/coffee/coding-rules/app.coffee     |  6 +++++-
 .../views/coding-rules-detail-view.coffee       |  9 +++++++--
 .../views/coding-rules-list-view.coffee         |  2 +-
 .../views/filters/repository-filter-view.coffee | 16 ++++++++++++----
 .../hbs/coding-rules/coding-rules-detail.hbs    | 17 +++++++++++------
 .../hbs/coding-rules/coding-rules-list-item.hbs |  2 +-
 .../coding-rules-repository-detail.hbs          |  6 +++---
 7 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/sonar-server/src/main/coffee/coding-rules/app.coffee b/sonar-server/src/main/coffee/coding-rules/app.coffee
index c15b385e8af..59b23fd2d5f 100644
--- a/sonar-server/src/main/coffee/coding-rules/app.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/app.coffee
@@ -137,6 +137,10 @@ requirejs [
       url: "#{baseUrl}/api/rules/search"
       data: fetchQuery
     .done (r) =>
+      _.map(r.rules, (rule) ->
+        rule.language = App.languages[rule.lang]
+      )
+
       if firstPage
         @codingRules.reset r.rules
       else
@@ -305,7 +309,7 @@ requirejs [
       type: RepositoryFilterView
       enabled: false
       optional: true
-      languageFilter: @languageFilter
+      app: @
       choices: @repositories
 
     @filters.add new BaseFilters.Filter
diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
index a9367da5fcd..b13c1f4d8b8 100644
--- a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
@@ -71,6 +71,9 @@ define [
           model: @contextProfile
         @listenTo @contextProfile, 'destroy', @hideContext
 
+      @model.set 'lang', @options.app.languages[@model.get 'lang']
+      repoKey = @model.get 'repo'
+      @model.set 'repository', _.find(@options.app.repositories, (repo) -> repo.key == repoKey).name
 
     onRender: ->
       @qualityProfilesRegion.show @qualityProfilesView
@@ -131,9 +134,11 @@ define [
       @ui.extendDescriptionSpinner.show()
       jQuery.ajax
         type: 'POST'
-        url: "#{baseUrl}/api/rules/extend_description"
+        url: "#{baseUrl}/api/rules/set_note"
         dataType: 'json'
-        data: text: @ui.extendDescriptionText.val()
+        data:
+          key: @model.get 'key'
+          text: @ui.extendDescriptionText.val()
       .done (r) =>
         @model.set extra: r.extra, extraRaw: r.extraRaw
         @render()
diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee
index 060daec34bd..77f46bdecc6 100644
--- a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-list-view.coffee
@@ -67,4 +67,4 @@ define [
         top = child.position().top
         if top < 0
           container.scrollTop(container.scrollTop() + top)
-        @selectIssue child, true
\ No newline at end of file
+        @selectIssue child, true
diff --git a/sonar-server/src/main/coffee/coding-rules/views/filters/repository-filter-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/filters/repository-filter-view.coffee
index a5d09d54336..e37837306f3 100644
--- a/sonar-server/src/main/coffee/coding-rules/views/filters/repository-filter-view.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/views/filters/repository-filter-view.coffee
@@ -6,21 +6,27 @@ define [
   Templates
 ) ->
 
-  class RepositoryFilterView extends ChoiceFilters.ChoiceFilterView
+  class RepositoryDetailFilterView extends ChoiceFilters.DetailsChoiceFilterView
     itemTemplate: Templates['coding-rules-repository-detail']
 
+
+  class RepositoryFilterView extends ChoiceFilters.ChoiceFilterView
+
     initialize: ->
       super
+        detailsView: RepositoryDetailFilterView
+
+      @app = @model.get 'app'
+
       @allRepositories = @model.get 'choices'
       @updateChoices @allRepositories
 
-      @languageFilter = @model.get 'languageFilter'
-      @listenTo @languageFilter, 'change:value', @onChangeLanguage
+      @listenTo @app.languageFilter, 'change:value', @onChangeLanguage
       @onChangeLanguage()
 
 
     onChangeLanguage: ->
-      languages = @languageFilter.get 'value'
+      languages = @app.languageFilter.get 'value'
       if _.isArray(languages) && languages.length > 0
         @filterLanguages(languages)
       else
@@ -32,6 +38,7 @@ define [
 
 
     updateChoices: (collection) ->
+      languages = @app.languages
       currentValue = @model.get('value')
       @choices = new Backbone.Collection( _.map collection, (item, index) ->
           new Backbone.Model
@@ -39,6 +46,7 @@ define [
             text: item.name
             checked: false
             index: index
+            language: languages[item.language]
         comparator: 'index'
       )
       if currentValue
diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs
index 09047ae954e..0681da3abc9 100644
--- a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs
+++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-detail.hbs
@@ -17,9 +17,13 @@
       <span class="coding-rules-detail-status">{{status}}</span>
     </li>
   {{/notEq}}
-  <li class="coding-rules-detail-property coding-rules-detail-tag-list coding-rules-detail-tags-change">
+
+  <li class="coding-rules-detail-property coding-rules-detail-systag-list">
     <i class="icon-tags"></i>
-    <span>{{#if tags}}{{join tags ', '}}{{else}}{{t 'coding_rules.no_tags'}}{{/if}}</span>
+    <span>{{#if sysTags}}{{join sysTags ', '}}{{/if}}</span>
+  </li>
+  <li class="coding-rules-detail-property coding-rules-detail-tag-list coding-rules-detail-tags-change">
+    <span>{{#if tags}}{{join tags ', '}}{{else}}{{#if sysTags}}{{t 'coding_rules.add_tags'}}{{else}}{{t 'coding_rules.no_tags'}}{{/if}}{{/if}}</span>
   </li>
   <li class="coding-rules-detail-property coding-rules-detail-tag-edit">
     <input class="coding-rules-detail-tag-input" type="text" value="{{#if tags}}{{join tags ','}}{{/if}}">
@@ -28,9 +32,10 @@
       <button class="coding-rules-detail-tag-edit-done">{{t 'Done'}}</button>
     </div>
   </li>
+
   <li class="coding-rules-detail-property">{{characteristic}}&nbsp;>&nbsp;{{subcharacteristic}}</li>
   <li class="coding-rules-detail-property">{{t 'coding_rules.available_since'}} {{fCreationDate}}</li>
-  <li class="coding-rules-detail-property">{{t 'coding_rules.repository'}} {{repo}} ({{repositoryKey}})</li>
+  <li class="coding-rules-detail-property">{{t 'coding_rules.repository'}} {{repository}} ({{repo}})</li>
   <li class="coding-rules-detail-property">{{t 'coding_rules.key'}} {{key}}</li>
 </ul>
 
@@ -38,8 +43,8 @@
 
 <div class="coding-rules-detail-description coding-rules-detail-description-extra">
   <div id="coding-rules-detail-description-extra">
-    {{#if extra}}
-      <div class="rule-desc marginbottom10">{{{extra}}}</div>{{/if}}
+    {{#if htmlNote}}
+      <div class="rule-desc marginbottom10">{{{htmlNote}}}</div>{{/if}}
     <div class="button-group">
       <button id="coding-rules-detail-extend-description">{{t 'coding_rules.extend_description'}}</button>
     </div>
@@ -51,7 +56,7 @@
       <tr>
         <td class="width100" colspan="2">
           <textarea id="coding-rules-detail-extend-description-text" rows="4"
-                    style="width: 100%; margin-bottom: 4px;">{{extraRaw}}</textarea>
+                    style="width: 100%; margin-bottom: 4px;">{{markdownNote}}</textarea>
         </td>
       </tr>
       <tr>
diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-list-item.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-list-item.hbs
index ec50f1ff313..89edb99d025 100644
--- a/sonar-server/src/main/hbs/coding-rules/coding-rules-list-item.hbs
+++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-list-item.hbs
@@ -1,5 +1,5 @@
 <div class="line line-small">
-  <span class="coding-rules-detail-status">{{lang}}</span>
+  <span class="coding-rules-detail-status">{{language}}</span>
   <div class="line-right">{{#notEq status 'READY'}}{{status}}{{/notEq}}</div>
 </div>
 <div class="line line-nowrap" title="{{name}}">{{name}}</div>
diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-repository-detail.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-repository-detail.hbs
index deec5403b52..cb7bc8ad149 100644
--- a/sonar-server/src/main/hbs/coding-rules/coding-rules-repository-detail.hbs
+++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-repository-detail.hbs
@@ -1,8 +1,8 @@
 <li>
-  <label title="{{name}}" class="polop">
-    <input type="checkbox" value="{{key}}" {{#if checked}}checked{{/if}}>
+  <label title="{{id}}">
+    <input type="checkbox" value="{{id}}" {{#if checked}}checked{{/if}}>
     <span>
-      {{name}}
+      {{text}}
       {{#if language}}
         <br>
         <span class="subtitle">{{language}}</span>
-- 
2.39.5