ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject git commit: AMBARI-6919. Abort request text popup edits. (Max Shepel via akovalenko)
Date Tue, 19 Aug 2014 16:41:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 1bd86fb12 -> 274567507


AMBARI-6919. Abort request text popup edits. (Max Shepel via akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/27456750
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/27456750
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/27456750

Branch: refs/heads/trunk
Commit: 2745675078ad3ff895b069b1b82179c769442ddb
Parents: 1bd86fb
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Tue Aug 19 19:40:02 2014 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Tue Aug 19 19:40:02 2014 +0300

----------------------------------------------------------------------
 ambari-web/app/messages.js                  | 2 +-
 ambari-web/app/utils/host_progress_popup.js | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/27456750/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 0a9fafd..6e118ba 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -262,7 +262,7 @@ Em.I18n.translations = {
   'hostPopup.bgop.abortRequest.confirmation.body': 'Are you sure you want to abort \'{0}\'
operation?',
   'hostPopup.bgop.abortRequest.reason': 'Aborted by user',
   'hostPopup.bgop.abortRequest.modal.header': 'Abort request sent',
-  'hostPopup.bgop.abortRequest.modal.body': 'The request to abort \'{0}\' operation is sent
to server. Note that some tasks that are already running may have enough time to finish as
completed or failed ones before abort request is applied.',
+  'hostPopup.bgop.abortRequest.modal.body': 'The abort request for <strong>{0}</strong>
has been sent to the server. Note: some tasks that are already running may have time to complete
or fail before the abort request is applied.',
   'hostPopup.bgop.sourceRequestSchedule.running': 'Future operations of this batch request
can be aborted',
   'hostPopup.bgop.sourceRequestSchedule.aborted': 'Future operations of this batch request
have been aborted',
   'hostPopup.bgop.abort.rollingRestart': 'Abort Rolling Restart',

http://git-wip-us.apache.org/repos/asf/ambari/blob/27456750/ambari-web/app/utils/host_progress_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js
index 4d27132..cc687df 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -133,7 +133,13 @@ App.HostPopup = Em.Object.create({
    * Method called on successful sending request to abort operation
    */
   abortRequestSuccessCallback: function (response, request, data) {
-    App.showAlertPopup(Em.I18n.t('hostPopup.bgop.abortRequest.modal.header'), Em.I18n.t('hostPopup.bgop.abortRequest.modal.body').format(data.requestName));
+    App.ModalPopup.show({
+      header: Em.I18n.t('hostPopup.bgop.abortRequest.modal.header'),
+      bodyClass: Em.View.extend({
+        template: Em.Handlebars.compile(Em.I18n.t('hostPopup.bgop.abortRequest.modal.body').format(data.requestName))
+      }),
+      secondary: null
+    });
   },
 
   /**


Mime
View raw message