Updated Branches: refs/heads/trunk 9a5060c0c -> c34ab731e
AMBARI-3096 Warning message after back from "Confirm Hosts" page with performed manual registration on hosts. (atkach) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/c34ab731 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/c34ab731 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/c34ab731 Branch: refs/heads/trunk Commit: c34ab731ed59ba66f8592a5944e13c892a8e9d11 Parents: 9a5060c Author: atkach <[email protected]> Authored: Wed Sep 4 19:31:23 2013 +0300 Committer: atkach <[email protected]> Committed: Wed Sep 4 19:31:23 2013 +0300 ---------------------------------------------------------------------- .../app/controllers/wizard/step2_controller.js | 17 +++++++++++++++++ ambari-web/app/views/wizard/step2_view.js | 15 --------------- 2 files changed, 17 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c34ab731/ambari-web/app/controllers/wizard/step2_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step2_controller.js b/ambari-web/app/controllers/wizard/step2_controller.js index da77b01..c30bd01 100644 --- a/ambari-web/app/controllers/wizard/step2_controller.js +++ b/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')) ; http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c34ab731/ambari-web/app/views/wizard/step2_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/step2_view.js b/ambari-web/app/views/wizard/step2_view.js index 24d96e8..d0f5d20 100644 --- a/ambari-web/app/views/wizard/step2_view.js +++ b/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',
