aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-06-12 14:56:42 +0200
committerJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-06-12 14:56:49 +0200
commit5f04d3746586100e0db6d3f0a48587f5388e7db8 (patch)
tree21b3776808094040979e7fed015620e100615f04
parent4af44075e1b04fbaa08f3cf43d9f34e0f34473b1 (diff)
downloadsonarqube-5f04d3746586100e0db6d3f0a48587f5388e7db8.tar.gz
sonarqube-5f04d3746586100e0db6d3f0a48587f5388e7db8.zip
SONAR-5137 Use lexical order for quality profiles list
-rw-r--r--sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-quality-profile-view.coffee4
-rw-r--r--sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee5
-rw-r--r--sonar-server/src/main/less/coding-rules.less1
3 files changed, 5 insertions, 5 deletions
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 c1f3c9a201d..651fb072a29 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
@@ -27,10 +27,6 @@ define [
'click @ui.deactivate': 'deactivate'
- initialize: ->
- super
- @model.set _.findWhere(@options.app.qualityProfiles, key: @model.get('qProfile'))
-
change: ->
@options.app.codingRulesQualityProfileActivationView.model = @model
@options.app.codingRulesQualityProfileActivationView.show()
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 010bf60bd5f..9ab21979bd3 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,7 +77,10 @@ define [
# collection: customRules
# rule: @model
else
- qualityProfiles = new Backbone.Collection options.actives
+ _.map options.actives, (active) =>
+ _.extend active, options.app.getQualityProfileByKey active.qProfile
+ qualityProfiles = new Backbone.Collection options.actives,
+ comparator: 'name'
@qualityProfilesView = new CodingRulesDetailQualityProfilesView
app: @options.app
collection: qualityProfiles
diff --git a/sonar-server/src/main/less/coding-rules.less b/sonar-server/src/main/less/coding-rules.less
index 2e158748b82..fb39f9c2a01 100644
--- a/sonar-server/src/main/less/coding-rules.less
+++ b/sonar-server/src/main/less/coding-rules.less
@@ -249,6 +249,7 @@
width: 15%;
font-weight: bold;
white-space: nowrap;
+ padding-right: 5px;
}
.coding-rules-detail-quality-profile-severity {