ambari git commit: AMBARI-9929 Move Master wizard: Hide the message to create keytab manually for the moved hostcomponent. (ababiichuk)

[ab...@apache.org]

Repository: ambari
Updated Branches:
  refs/heads/trunk 67c8448bc -> 68404cc82


AMBARI-9929 Move Master wizard: Hide the message to create keytab manually for the moved hostcomponent. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: 68404cc82b4999fe6b13735906597679fc42a78c
Parents: 67c8448
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Mar 4 19:37:33 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Mar 4 19:56:56 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/main/service/reassign_controller.js | 4 ++--
 ambari-web/app/templates/main/service/reassign/step5.hbs       | 6 +++---
 ambari-web/app/views/main/service/reassign/step5_view.js       | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/68404cc8/ambari-web/app/controllers/main/service/reassign_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/reassign_controller.js b/ambari-web/app/controllers/main/service/reassign_controller.js
index 2793491..b234143 100644
--- a/ambari-web/app/controllers/main/service/reassign_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign_controller.js
@@ -82,8 +82,8 @@ App.ReassignMasterController = App.WizardController.extend({
   ],
 
   addManualSteps: function () {
-    this.set('content.hasManualSteps', this.get('content.componentsWithManualCommands').contains(this.get('content.reassign.component_name')) || this.get('content.securityEnabled'));
-  }.observes('content.reassign.component_name', 'content.securityEnabled'),
+    this.set('content.hasManualSteps', this.get('content.componentsWithManualCommands').contains(this.get('content.reassign.component_name')));
+  }.observes('content.reassign.component_name'),
 
   addCheckDBStep: function () {
     this.set('content.hasCheckDBStep', this.get('content.componentsWithCheckDBStep').contains(this.get('content.reassign.component_name')));

http://git-wip-us.apache.org/repos/asf/ambari/blob/68404cc8/ambari-web/app/templates/main/service/reassign/step5.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/reassign/step5.hbs b/ambari-web/app/templates/main/service/reassign/step5.hbs
index 88cf862..aee9c5b 100644
--- a/ambari-web/app/templates/main/service/reassign/step5.hbs
+++ b/ambari-web/app/templates/main/service/reassign/step5.hbs
@@ -17,9 +17,9 @@
 }}
 <h2>{{t services.reassign.step5.header}}</h2>
 {{{view.manualCommands}}}
-{{#if view.securityNotice}}
-  {{{view.securityNotice}}}
-{{/if}}
+{{!#if view.securityNotice}}
+  {{!{view.securityNotice}}
+{{!/if}}
 <div class="btn-area">
   <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action next}}>{{t common.next}} &rarr;</a>
 </div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/68404cc8/ambari-web/app/views/main/service/reassign/step5_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/reassign/step5_view.js b/ambari-web/app/views/main/service/reassign/step5_view.js
index fb59bbe..b08df7b 100644
--- a/ambari-web/app/views/main/service/reassign/step5_view.js
+++ b/ambari-web/app/views/main/service/reassign/step5_view.js
@@ -46,6 +46,9 @@ App.ReassignMasterWizardStep5View = Em.View.extend({
     return Em.I18n.t('services.reassign.step5.body.' + this.get('controller.content.reassign.component_name').toLowerCase() + ha).format(componentDir, sourceHost, targetHost, user, nnStartedHost,this.get('controller.content.group'), componentDirCmd);
   }.property('controller.content.reassign.component_name', 'controller.content.componentDir', 'controller.content.masterComponentHosts', 'controller.content.reassign.host_id', 'controller.content.hdfsUser'),
 
+  /**
+   * security notice to generate keytab manually is not used any more
+   */
   securityNotice: function () {
     var secureConfigs = this.get('controller.content.secureConfigs');
     var proceedMsg = Em.I18n.t('services.reassign.step5.body.proceedMsg');