incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject [1/2] git commit: AMBARI-3639. Reassign wizard "Assign Master": on HA enabled cluster, button next is disabled without explanation. (akovalenko)
Date Thu, 31 Oct 2013 15:58:31 GMT
Updated Branches:
  refs/heads/trunk 062069479 -> d6277f619


AMBARI-3639. Reassign wizard "Assign Master": on HA enabled cluster, button next is disabled
without explanation. (akovalenko)


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

Branch: refs/heads/trunk
Commit: e524a02977733404974cd8c354dd533f9162a26a
Parents: 0620694
Author: Aleksandr Kovalenko <oleksandr.kovalenko@ukr.net>
Authored: Thu Oct 31 17:52:12 2013 +0200
Committer: Aleksandr Kovalenko <oleksandr.kovalenko@ukr.net>
Committed: Thu Oct 31 17:57:22 2013 +0200

----------------------------------------------------------------------
 ambari-web/app/messages.js                               | 2 ++
 ambari-web/app/templates/wizard/step5.hbs                | 2 +-
 ambari-web/app/views/main/service/reassign/step2_view.js | 9 ++++++++-
 ambari-web/app/views/wizard/step5_view.js                | 4 +++-
 4 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e524a029/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 1413888..6a205b0 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1098,6 +1098,8 @@ Em.I18n.translations = {
     'for cluster downtime when reassigning {0}.</b>',
 
   'services.reassign.step2.header':'Assign Master',
+  'services.reassign.step2.body':'Assign {0} to new host.',
+  'services.reassign.step2.body.namenodeHA':'Assign {0} to new host. You can reassign only
one master component at a time.',
   'services.reassign.step3.header':'Review',
   'services.reassign.step3.body':'Please review the changes you made',
   'services.reassign.step3.targetHost':'Target Host:',

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e524a029/ambari-web/app/templates/wizard/step5.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step5.hbs b/ambari-web/app/templates/wizard/step5.hbs
index e98938f..60dc7e2 100644
--- a/ambari-web/app/templates/wizard/step5.hbs
+++ b/ambari-web/app/templates/wizard/step5.hbs
@@ -18,7 +18,7 @@
 
 <h2>{{title}}</h2>
 <div class="alert alert-info">
-  {{t installer.step5.body}}
+  {{view.body}}
   {{#if hasHiveServer}}
     <br>
     {{t installer.step5.body.hive}}

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e524a029/ambari-web/app/views/main/service/reassign/step2_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/reassign/step2_view.js b/ambari-web/app/views/main/service/reassign/step2_view.js
index 1e07497..662330d 100644
--- a/ambari-web/app/views/main/service/reassign/step2_view.js
+++ b/ambari-web/app/views/main/service/reassign/step2_view.js
@@ -19,4 +19,11 @@
 
 var App = require('app');
 
-App.ReassignMasterWizardStep2View = App.WizardStep5View.extend();
+App.ReassignMasterWizardStep2View = App.WizardStep5View.extend({
+  body: function () {
+    if (this.get('controller.content.reassign.component_name') === 'NAMENODE' &&
!App.HostComponent.find().someProperty('componentName', 'SECONDARY_NAMENODE')) {
+      return Em.I18n.t('services.reassign.step2.body.namenodeHA').format(this.get('controller.content.reassign.display_name'));
+    }
+    return Em.I18n.t('services.reassign.step2.body').format(this.get('controller.content.reassign.display_name'));
+  }.property('controller.content.reassign.component_name', 'controller.content.reassign.display_name')
+});

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e524a029/ambari-web/app/views/wizard/step5_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step5_view.js b/ambari-web/app/views/wizard/step5_view.js
index d735b8a..8fe1894 100644
--- a/ambari-web/app/views/wizard/step5_view.js
+++ b/ambari-web/app/views/wizard/step5_view.js
@@ -26,7 +26,9 @@ App.WizardStep5View = Em.View.extend({
 
   didInsertElement:function () {
     this.get('controller').loadStep();
-  }
+  },
+
+  body: Em.I18n.t('installer.step5.body')
 
 });
 


Mime
View raw message