fix SONAR-6657 Cannot deactivate just activated rule

2 files changed, 5 insertions, 3 deletions

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/profile-activation-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/profile-activation-view.js
index a310ce97674..87296ca2e0f 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/rule/profile-activation-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/profile-activation-view.js
@@ -112,7 +112,7 @@ define([
         }
       }).done(function () {
         that.destroy();
-        that.trigger('profileActivated', severity, params);
+        that.trigger('profileActivated', severity, params, profileKey);
       }).fail(function (jqXHR) {
         that.enableForm();
         that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings);
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-item-view.js b/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-item-view.js
index b18ba7b52e1..1041a326de9 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-item-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/workspace-list-item-view.js
@@ -62,10 +62,12 @@ define([
             collection: new Backbone.Collection(othersQualityProfiles),
             app: this.options.app
           });
-      activationView.on('profileActivated', function (severity) {
+      activationView.on('profileActivated', function (severity, params, profile) {
         var activation = {
           severity: severity,
-          inherit: 'NONE'
+          inherit: 'NONE',
+          params: params,
+          qProfile: profile
         };
         that.model.set({ activation: activation });
       });