SONAR-6602 apply feedback for groups page

diff --git a/server/sonar-web/src/main/js/apps/groups/delete-view.js b/server/sonar-web/src/main/js/apps/groups/delete-view.js
index 137aa768da2808c3c6deefcb6ca8fdfcbd42ddee..05e07c0d0329b460576f717d16025434b36c7605 100644 (file)
--- a/server/sonar-web/src/main/js/apps/groups/delete-view.js
+++ b/server/sonar-web/src/main/js/apps/groups/delete-view.js
@@ -26,6 +26,12 @@ define([
       }).fail(function (jqXHR) {
         that.showErrors(jqXHR.responseJSON.errors, jqXHR.responseJSON.warnings);
       });
+    },
+
+    showErrors: function (errors, warnings) {
+      this.$('.js-modal-text').addClass('hidden');
+      this.disableForm();
+      this._super(errors, warnings);
     }
   });
 

diff --git a/server/sonar-web/src/main/js/apps/groups/group.js b/server/sonar-web/src/main/js/apps/groups/group.js
index 406f9ba3a3a67aabea353c12f3af8e0af5a5d510..aced6727b911051d008cbc82d19b73ac8de87eaf 100644 (file)
--- a/server/sonar-web/src/main/js/apps/groups/group.js
+++ b/server/sonar-web/src/main/js/apps/groups/group.js
@@ -15,10 +15,11 @@ define(function () {
         });
       }
       if (method === 'update') {
+        var attrs = _.extend(_.pick(model.changed, 'name', 'description'), { id: model.id });
         _.defaults(opts, {
           url: this.urlRoot() + '/update',
           type: 'POST',
-          data: _.pick(model.toJSON(), 'id', 'name', 'description')
+          data: attrs
         });
       }
       if (method === 'delete') {

diff --git a/server/sonar-web/src/main/js/apps/groups/templates/groups-delete.hbs b/server/sonar-web/src/main/js/apps/groups/templates/groups-delete.hbs
index 0644817633e91bcaca3870975087331c4182fcdf..30628d56777188ff7466341f8143bdf3e257fef7 100644 (file)
--- a/server/sonar-web/src/main/js/apps/groups/templates/groups-delete.hbs
+++ b/server/sonar-web/src/main/js/apps/groups/templates/groups-delete.hbs
@@ -4,7 +4,7 @@
   </div>
   <div class="modal-body">
     <div class="js-modal-messages"></div>
-    Are you sure you want to delete "{{name}}"?
+    <div class="js-modal-text">Are you sure you want to delete "{{name}}"?</div>
   </div>
   <div class="modal-foot">
     <button id="delete-group-submit">Delete</button>

diff --git a/server/sonar-web/src/main/js/apps/groups/templates/groups-list-item.hbs b/server/sonar-web/src/main/js/apps/groups/templates/groups-list-item.hbs
index 611cc382493aa5c7e014936ade0b62d433be517c..2720785b527421daa0f94f6e24bbd28d1b6919b8 100644 (file)
--- a/server/sonar-web/src/main/js/apps/groups/templates/groups-list-item.hbs
+++ b/server/sonar-web/src/main/js/apps/groups/templates/groups-list-item.hbs
@@ -1,6 +1,6 @@
 <div class="pull-right big-spacer-left nowrap">
   <a class="js-group-update icon-edit little-spacer-right" title="Update Details" data-toggle="tooltip" href="#"></a>
-  <a class="js-group-delete icon-delete" title="Deactivate" data-toggle="tooltip" href="#"></a>
+  <a class="js-group-delete icon-delete" title="Delete" data-toggle="tooltip" href="#"></a>
 </div>
 
 <div class="display-inline-block text-top width-20">

diff --git a/server/sonar-web/src/test/js/groups-spec.js b/server/sonar-web/src/test/js/groups-spec.js
index ef21e8a8fea10c0e772392fde9058df7fc81f509..8d8b371105c074f919f6254a68490c3187cd00ca 100644 (file)
--- a/server/sonar-web/src/test/js/groups-spec.js
+++ b/server/sonar-web/src/test/js/groups-spec.js
@@ -335,6 +335,16 @@ casper.test.begin(testName('Delete'), 1, function (test) {
         casper.waitForSelector('.alert.alert-danger');
       })
 
+      .then(function () {
+        casper.click('.js-modal-close');
+        casper.waitWhileSelector('#delete-group-form');
+      })
+
+      .then(function () {
+        casper.click('[data-id="1"] .js-group-delete');
+        casper.waitForSelector('#delete-group-form');
+      })
+
       .then(function () {
         lib.clearRequestMock(this.updateMock);
         lib.mockRequest('/api/usergroups/delete', '{}', { data: { id: '1'} });