diff options
Diffstat (limited to 'server/sonar-web')
-rw-r--r-- | server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js | 5 | ||||
-rw-r--r-- | server/sonar-web/src/test/js/coding-rules-page-bulk-change.js | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js b/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js index b1bddfecdca..08a2cdadf90 100644 --- a/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js +++ b/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js @@ -36,14 +36,15 @@ define([ showSuccessMessage: function (profile, succeeded) { var profileBase = _.findWhere(this.options.app.qualityProfiles, { key: profile }), profileName = profileBase != null ? profileBase.name : profile, - message = tp('coding_rules.bulk_change.success', profileName, succeeded); + message = tp('coding_rules.bulk_change.success', profileName, profileBase.language, succeeded); + console.log(profileBase); this.ui.messagesContainer.append('<div class="alert alert-success">' + message + '</div>'); }, showWarnMessage: function (profile, succeeded, failed) { var profileBase = _.findWhere(this.options.app.qualityProfiles, { key: profile }), profileName = profileBase != null ? profileBase.name : profile, - message = tp('coding_rules.bulk_change.warning', profileName, succeeded, failed); + message = tp('coding_rules.bulk_change.warning', profileName, profileBase.language, succeeded, failed); this.ui.messagesContainer.append('<div class="alert alert-warning">' + message + '</div>'); }, diff --git a/server/sonar-web/src/test/js/coding-rules-page-bulk-change.js b/server/sonar-web/src/test/js/coding-rules-page-bulk-change.js index 9d455734b08..1bb77b479fb 100644 --- a/server/sonar-web/src/test/js/coding-rules-page-bulk-change.js +++ b/server/sonar-web/src/test/js/coding-rules-page-bulk-change.js @@ -78,6 +78,8 @@ casper.test.begin(testName('Activate', 'Success'), function (test) { }) .then(function () { + test.assertSelectorContains('.modal', 'Default - Maven Conventions'); + test.assertSelectorContains('.modal', 'Java'); test.assertSelectorContains('.modal', '225'); }) |