Selaa lähdekoodia

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

aBabiichuk 10 vuotta sitten
vanhempi
commit
68404cc82b

+ 2 - 2
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')));

+ 3 - 3
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>

+ 3 - 0
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');