From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 9 Jan 2017 13:38:41 +0000 (+0100)
Subject: SONAR-8562 apply feedback
X-Git-Tag: 6.3-RC1~614
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fccbe954584226cac226f1f005490fbb1a318016;p=sonarqube.git

SONAR-8562 apply feedback
---

diff --git a/server/sonar-web/src/main/js/apps/issues/BulkChangeForm.js b/server/sonar-web/src/main/js/apps/issues/BulkChangeForm.js
index 302033520c8..3ff21ded414 100644
--- a/server/sonar-web/src/main/js/apps/issues/BulkChangeForm.js
+++ b/server/sonar-web/src/main/js/apps/issues/BulkChangeForm.js
@@ -153,11 +153,6 @@ export default ModalForm.extend({
     this.prepareTagsInput();
   },
 
-  handleErrors (response) {
-    const message = response['err_msg'] ? translate(response['err_msg']) : translate('default_error_message');
-    this.showErrors([{ msg: message }]);
-  },
-
   onFormSubmit () {
     ModalForm.prototype.onFormSubmit.apply(this, arguments);
     const actions = [];
@@ -222,7 +217,7 @@ export default ModalForm.extend({
         (e: Object) => {
           this.enableForm();
           this.hideSpinner();
-          e.response.json().then(r => this.handleErrors(r));
+          e.response.json().then(r => this.showErrors(r.errors, r.warnings));
         }
     );
   },
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/BulkChangeForm.hbs b/server/sonar-web/src/main/js/apps/issues/templates/BulkChangeForm.hbs
index 85f568c9615..fda291ab2b3 100644
--- a/server/sonar-web/src/main/js/apps/issues/templates/BulkChangeForm.hbs
+++ b/server/sonar-web/src/main/js/apps/issues/templates/BulkChangeForm.hbs
@@ -135,9 +135,11 @@
   </div>
   <div class="modal-body">
     <div class="js-modal-messages"></div>
-    <i class="icon-spinner"></i>
+    <div class="text-center">
+      <i class="spinner spinner-margin"></i>
+    </div>
   </div>
   <div class="modal-foot">
-    &nbsp;
+    <a id="bulk-change-cancel" href="#" class="js-modal-close">{{t 'cancel'}}</a>
   </div>
 {{/if}}