瀏覽代碼

AMBARI-3096 Warning message after back from "Confirm Hosts" page with performed manual registration on hosts. (atkach)

atkach 11 年之前
父節點
當前提交
c34ab731ed
共有 2 個文件被更改,包括 17 次插入15 次删除
  1. 17 0
      ambari-web/app/controllers/wizard/step2_controller.js
  2. 0 15
      ambari-web/app/views/wizard/step2_view.js

+ 17 - 0
ambari-web/app/controllers/wizard/step2_controller.js

@@ -328,6 +328,23 @@ App.WizardStep2Controller = Em.Controller.extend({
       })
     });
   },
+  /**
+   * warn to manually install ambari-agent on each host
+   */
+  manualInstallWarningPopup: function(){
+    if(!this.get('content.installOptions.useSsh')){
+      App.ModalPopup.show({
+        header: Em.I18n.t('common.warning'),
+        body: Em.I18n.t('installer.step2.manualInstall.info'),
+        encodeBody: false,
+        onPrimary: function () {
+          this.hide();
+        },
+        secondary: null
+      });
+    }
+    this.set('content.installOptions.manualInstall', !this.get('content.installOptions.useSsh'));
+  }.observes('content.installOptions.useSsh'),
 
   isSubmitDisabled: function () {
     return (this.get('hostsError') || this.get('sshKeyError') || this.get('sshUserError'))  ;

+ 0 - 15
ambari-web/app/views/wizard/step2_view.js

@@ -65,21 +65,6 @@ App.WizardStep2View = Em.View.extend({
     return (window.File && window.FileReader && window.FileList) ? true : false ;
   }.property(),
 
-  manualInstallPopup: function(){
-    if(!this.get('controller.content.installOptions.useSsh')){
-      App.ModalPopup.show({
-        header: Em.I18n.t('common.warning'),
-        body: Em.I18n.t('installer.step2.manualInstall.info'),
-        encodeBody: false,
-        onPrimary: function () {
-          this.hide();
-        },
-        secondary: null
-      });
-    }
-    this.set('controller.content.installOptions.manualInstall', !this.get('controller.content.installOptions.useSsh'));
-  }.observes('controller.content.installOptions.useSsh'),
-
   //TODO: replace next 2 properties with new one used in both places
   providingSSHKeyRadioButton: Ember.Checkbox.extend({
     tagName: 'input',