SONAR-5007 SONAR-5136 Display yet more rule fields in coding rules details

8 files changed, 31 insertions, 19 deletions

diff --git a/sonar-server/src/main/coffee/coding-rules/app.coffee b/sonar-server/src/main/coffee/coding-rules/app.coffee
index f67d1d989f3..5a4c8980dcc 100644
--- a/sonar-server/src/main/coffee/coding-rules/app.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/app.coffee
@@ -148,7 +148,11 @@ requirejs [
         @codingRules.reset r.rules
       else
         @codingRules.add r.rules
-      @codingRules.paging = r.paging
+      @codingRules.paging =
+        total: r.total
+        pageIndex: r.p
+        pageSize: r.ps
+        pages: 1 + (r.total / r.ps)
       @codingRulesListView = new CodingRulesListView
         app: @
         collection: @codingRules
diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profile-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profile-view.coffee
index a56c7df47d4..a160fe78d37 100644
--- a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profile-view.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profile-view.coffee
@@ -77,3 +77,4 @@ define [
       _.extend super,
         parent: @getParent()
         parameters: @enhanceParameters()
+        canWrite: @options.app.canWrite
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 d7272f8bf80..3eae915bf2c 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
@@ -77,6 +77,8 @@ define [
       repoKey = @model.get 'repo'
       @model.set 'repository', _.find(@options.app.repositories, (repo) -> repo.key == repoKey).name
       @model.set 'canWrite', @options.app.canWrite
+      @model.set 'subcharacteristic', @options.app.characteristics[@model.get 'debtSubChar']
+      @model.set 'createdAt', new Date(@model.get 'createdAt')
 
     onRender: ->
       @qualityProfilesRegion.show @qualityProfilesView
diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee
index 00180916d33..d51bb7518e8 100644
--- a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-quality-profile-activation-view.coffee
@@ -25,6 +25,9 @@ define [
 
     activate: ->
       profileKey = @ui.qualityProfileSelect.val()
+      params = @ui.qualityProfileParameters.map(->
+        key: jQuery(@).prop('name'), value: jQuery(@).val() || jQuery(@).prop('placeholder')).get()
+
       if @model
         profileKey = @model.get('qProfile')
       severity = @ui.qualityProfileSeverity.val()
@@ -37,18 +40,16 @@ define [
             profile_key: profileKey
             rule_key: @rule.get('key')
             severity: severity
+            params: params
       .done =>
-          parameters = @ui.qualityProfileParameters.map(->
-            key: jQuery(@).prop('name'), value: jQuery(@).val() || jQuery(@).prop('placeholder')).get()
-
           if @model
-            @model.set severity: severity, parameters: parameters
+            @model.set severity: severity, params: params
           else
             model = new Backbone.Model
               name: _.findWhere(@options.app.qualityProfiles, key: profileKey).name
               key: profileKey
               severity: severity
-              parameters: parameters
+              params: params
             @options.app.detailView.qualityProfilesView.collection.add model
 
           @hide()
@@ -98,16 +99,16 @@ define [
 
 
     serializeData: ->
-      parameters = @rule.get 'parameters'
+      params = @rule.get 'params'
       if @model
-        modelParameters = @model.get 'parameters'
-        if modelParameters
-          parameters = parameters.map (p) ->
-            _.extend p, value: _.findWhere(modelParameters, key: p.key).value
+        modelParams = @model.get 'params'
+        if modelParams
+          params = params.map (p) ->
+            _.extend p, value: _.findWhere(modelParams, key: p.key).value
 
       _.extend super,
         rule: @rule.toJSON()
         change: @model && @model.has 'severity'
-        parameters: parameters
+        params: params
         qualityProfiles: @getAvailableQualityProfiles()
         severities: ['BLOCKER', 'CRITICAL', 'MAJOR', 'MINOR', 'INFO']
diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs
index 77e94242fa8..66b53ff756e 100644
--- a/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs
+++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-actions.hbs
@@ -12,7 +12,7 @@
   <li data-sort="NAME" data-asc="false">{{t 'coding_rules.sort.name'}} <i class="icon-sort-desc"></i></li>
 </ul>
 <div class="navigator-actions-total">
-  {{t 'coding_rules.found'}}: <strong>{{paging.fTotal}}</strong>
+  {{t 'coding_rules.found'}}: <strong>{{paging.total}}</strong>
   {{#if canWrite}}<a class="navigator-actions-bulk"
      title="{{t 'bulk_change'}}"><i class="icon-bulk-change"></i></a>{{/if}}
 </div>
diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-quality-profile.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-quality-profile.hbs
index 61ef4429c51..aedd752f084 100644
--- a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-quality-profile.hbs
+++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-quality-profile.hbs
@@ -21,7 +21,7 @@
       </td>
 
       <td class="coding-rules-detail-quality-profile-parameters">
-        {{#each parameters}}
+        {{#each params}}
           <div class="coding-rules-detail-quality-profile-parameter">
             <span class="key">{{key}}</span><span class="sep">:&nbsp;</span><span class="value" title="{{value}}">{{value}}</span>
             {{#if ../parent}}{{#notEq value original}}
@@ -34,6 +34,7 @@
         &nbsp;
       </td>
 
+      {{#if canWrite}}
       <td class="coding-rules-detail-quality-profile-actions">
         <div class="button-group">
           <button class="coding-rules-detail-quality-profile-change">{{t 'change_verb'}}</button>
@@ -47,12 +48,15 @@
           </button>
         </div>
       </td>
+      {{/if}}
     {{else}}
+      {{#if canWrite}}
       <td class="coding-rules-detail-quality-profile-actions">
         <div class="button-group">
           <button class="coding-rules-detail-quality-profile-activate">{{t 'coding_rules.activate'}}</button>
         </div>
       </td>
+      {{/if}}
     {{/if}}
   </tr>
   </tbody>
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 c084998dc04..25cec748f3c 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
@@ -2,7 +2,7 @@
 
 <h3 class="coding-rules-detail-header">
   {{name}}
-  <a class="coding-rules-detail-permalink" href="#key={{key}}">
+  <a class="coding-rules-detail-permalink" href="#q={{key}}">
     <i class="icon-link"></i> {{t 'coding_rules.permalink'}}
   </a>
 </h3>
@@ -41,8 +41,8 @@
     </div>
   </li>{{/if}}
 
-  <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">{{subcharacteristic}}</li>
+  <li class="coding-rules-detail-property">{{t 'coding_rules.available_since'}} {{d createdAt}}</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>
diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs
index 56b256158cc..0f839b022b0 100644
--- a/sonar-server/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs
+++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-quality-profile-activation.hbs
@@ -35,7 +35,7 @@
           </select>
         </td>
       </tr>
-      {{#each parameters}}
+      {{#each params}}
         <tr class="property">
           <th><h3>{{key}}</h3></th>
           <td>
@@ -60,4 +60,4 @@
     </button>
     <a id="coding-rules-quality-profile-activation-cancel" class="action">{{t 'cancel'}}</a>
   </div>
-</form>
\ No newline at end of file
+</form>