diff options
| author | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-05-22 14:50:36 +0200 |
|---|---|---|
| committer | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2014-05-22 17:27:25 +0200 |
| commit | e73d14a8c479ac4c8e3fdaecd923ba163ed29392 (patch) | |
| tree | c721fc785f3cbf1283833651b31c10162d6a667c /sonar-server | |
| parent | 9ddb131f257168074ae681723a967ad2e7b91591 (diff) | |
| download | sonarqube-e73d14a8c479ac4c8e3fdaecd923ba163ed29392.tar.gz sonarqube-e73d14a8c479ac4c8e3fdaecd923ba163ed29392.zip | |
SONAR-5007 SONAR-5136 Handle parameters on activation/change
Diffstat (limited to 'sonar-server')
2 files changed, 5 insertions, 3 deletions
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}} |