From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Thu, 22 May 2014 12:50:36 +0000 (+0200)
Subject: SONAR-5007 SONAR-5136 Handle parameters on activation/change
X-Git-Tag: 4.4-RC1~896
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e73d14a8c479ac4c8e3fdaecd923ba163ed29392;p=sonarqube.git

SONAR-5007 SONAR-5136 Handle parameters on activation/change
---

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 d51bb7518e8..49df39f8805 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
@@ -28,6 +28,8 @@ define [
       params = @ui.qualityProfileParameters.map(->
         key: jQuery(@).prop('name'), value: jQuery(@).val() || jQuery(@).prop('placeholder')).get()
 
+      paramsHash = _.reduce((params.map (param) -> param.key + '=' + param.value), ((hash, param) -> hash + ';' + param), '')
+
       if @model
         profileKey = @model.get('qProfile')
       severity = @ui.qualityProfileSeverity.val()
@@ -40,7 +42,7 @@ define [
             profile_key: profileKey
             rule_key: @rule.get('key')
             severity: severity
-            params: params
+            params: paramsHash
       .done =>
           if @model
             @model.set severity: severity, params: params
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 0f839b022b0..3cc1097a543 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
@@ -40,9 +40,9 @@
           <th><h3>{{key}}</h3></th>
           <td>
             {{#eq type 'TEXT'}}
-              <textarea class="width100" rows="3" name="{{key}}"placeholder="{{default}}">{{value}}</textarea>
+              <textarea class="width100" rows="3" name="{{key}}" placeholder="{{defaultValue}}">{{value}}</textarea>
             {{else}}
-              <input type="text" name="{{key}}" value="{{value}}" placeholder="{{default}}">
+              <input type="text" name="{{key}}" value="{{value}}" placeholder="{{defaultValue}}">
             {{/eq}}
             <div class="note">{{description}}</div>
             {{#if extra}}