SONAR-5091 Update deletion confirm messages in conformance to UI guidelines

4 files changed, 30 insertions, 22 deletions

diff --git a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.coffee b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.coffee
index df3527a8426..8e76e209300 100644
--- a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.coffee
+++ b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.coffee
@@ -90,7 +90,7 @@ define [
 
 
     deleteCondition: ->
-      if confirm t('are_you_sure')
+      if confirm t('quality_gates.delete_condition.confirm.message')
         @showSpinner()
         @model.delete().done =>
           @options.collectionView.collection.remove @model
diff --git a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js
index e966af2b0c7..e3141fdb3c3 100644
--- a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js
+++ b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js
@@ -113,7 +113,7 @@
       };
 
       QualityGateDetailConditionView.prototype.deleteCondition = function() {
-        if (confirm(t('are_you_sure'))) {
+        if (confirm(t('quality_gates.delete_condition.confirm.message'))) {
           this.showSpinner();
           return this.model["delete"]().done((function(_this) {
             return function() {
diff --git a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-header-view.coffee b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-header-view.coffee
index 69900f06562..d4cda7f5d8a 100644
--- a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-header-view.coffee
+++ b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-header-view.coffee
@@ -40,7 +40,8 @@ define [
 
 
     deleteQualityGate: ->
-      if confirm t('are_you_sure')
+      message = if @model.get 'default' then 'quality_gates.delete.confirm.default' else 'quality_gates.delete.confirm.message'
+      if confirm t(message).replace('{0}', @model.get 'name')
         @showSpinner()
         jQuery.ajax
           type: 'POST'
diff --git a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-header-view.js b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-header-view.js
index c2f5cf0b8ed..2e155bcb7b8 100644
--- a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-header-view.js
+++ b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-header-view.js
@@ -1,16 +1,15 @@
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
 (function() {
   var __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
   define(['backbone.marionette', 'handlebars', 'quality-gate/models/quality-gate'], function(Marionette, Handlebars, QualityGate) {
-    var QualityGateDetailHeaderView, _ref;
+    var QualityGateDetailHeaderView;
     return QualityGateDetailHeaderView = (function(_super) {
       __extends(QualityGateDetailHeaderView, _super);
 
       function QualityGateDetailHeaderView() {
-        _ref = QualityGateDetailHeaderView.__super__.constructor.apply(this, arguments);
-        return _ref;
+        return QualityGateDetailHeaderView.__super__.constructor.apply(this, arguments);
       }
 
       QualityGateDetailHeaderView.prototype.template = Handlebars.compile(jQuery('#quality-gate-detail-header-template').html());
@@ -45,8 +44,9 @@
       };
 
       QualityGateDetailHeaderView.prototype.deleteQualityGate = function() {
-        var _this = this;
-        if (confirm(t('are_you_sure'))) {
+        var message;
+        message = this.model.get('default') ? 'quality_gates.delete.confirm.default' : 'quality_gates.delete.confirm.message';
+        if (confirm(t(message).replace('{0}', this.model.get('name')))) {
           this.showSpinner();
           return jQuery.ajax({
             type: 'POST',
@@ -54,17 +54,20 @@
             data: {
               id: this.model.id
             }
-          }).always(function() {
-            return _this.hideSpinner();
-          }).done(function() {
-            return _this.options.app.deleteQualityGate(_this.model.id);
-          });
+          }).always((function(_this) {
+            return function() {
+              return _this.hideSpinner();
+            };
+          })(this)).done((function(_this) {
+            return function() {
+              return _this.options.app.deleteQualityGate(_this.model.id);
+            };
+          })(this));
         }
       };
 
       QualityGateDetailHeaderView.prototype.changeDefault = function(set) {
-        var data, method,
-          _this = this;
+        var data, method;
         this.showSpinner();
         data = set ? {
           id: this.model.id
@@ -74,12 +77,16 @@
           type: 'POST',
           url: "" + baseUrl + "/api/qualitygates/" + method,
           data: data
-        }).always(function() {
-          return _this.hideSpinner();
-        }).done(function() {
-          _this.options.app.unsetDefaults(_this.model.id);
-          return _this.model.set('default', !_this.model.get('default'));
-        });
+        }).always((function(_this) {
+          return function() {
+            return _this.hideSpinner();
+          };
+        })(this)).done((function(_this) {
+          return function() {
+            _this.options.app.unsetDefaults(_this.model.id);
+            return _this.model.set('default', !_this.model.get('default'));
+          };
+        })(this));
       };
 
       QualityGateDetailHeaderView.prototype.setAsDefault = function() {