Repository: ambari Updated Branches: refs/heads/trunk 4468e1624 -> 237715f04
AMBARI-17073 HDF Management install does not allow one to select public repo (zhewang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/237715f0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/237715f0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/237715f0 Branch: refs/heads/trunk Commit: 237715f04d00e8fcf90bfbbc9ca19939b2457539 Parents: 4468e16 Author: Zhe (Joe) Wang <zhew...@apache.org> Authored: Tue Jun 7 10:33:38 2016 -0700 Committer: Zhe (Joe) Wang <zhew...@apache.org> Committed: Tue Jun 7 10:34:01 2016 -0700 ---------------------------------------------------------------------- ambari-web/app/messages.js | 7 ++++--- ambari-web/app/templates/wizard/step1.hbs | 2 +- .../wizard/step1/public_option_disabled_window_body.hbs | 3 ++- ambari-web/app/views/wizard/step1_view.js | 1 - 4 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/237715f0/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index e8ca9ae..2e1b253 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -558,12 +558,13 @@ Em.I18n.translations = { 'installer.step1.changeVersion.defaultVersion':'Default Version Definition', 'installer.step1.selectUseRepoOptions.public':'Use Public Repository', 'installer.step1.selectUseRepoOptions.public.networkLost.button':'Not Available', - 'installer.step1.selectUseRepoOptions.public.networkLost':'Why is this disabled?', - 'installer.step1.selectUseRepoOptions.public.networkLost.popup.title': 'Public Repository Option Disabled', - 'installer.step1.selectUseRepoOptions.public.networkLost.popup.msg': 'Ambari does not have access to the Internet and cannot use the Public Repository for installing the software. Your Options:', + 'installer.step1.selectUseRepoOptions.public.networkLost':'Why is this not selected?', + 'installer.step1.selectUseRepoOptions.public.networkLost.popup.title': 'Public Repository Option Not Selected', + 'installer.step1.selectUseRepoOptions.public.networkLost.popup.msg': 'Ambari is unable to confirm access to the Public Repositories, which means you might not have Internet access and will not be able to use the Public Repository option for installing the software. Your choices:', 'installer.step1.selectUseRepoOptions.public.networkLost.popup.msg1': 'Configure your hosts for access to the Internet.', 'installer.step1.selectUseRepoOptions.public.networkLost.popup.msg2': 'If you are using an Internet Proxy, refer to the Ambari Documentation on how to configure Ambari to use the Internet Proxy.', 'installer.step1.selectUseRepoOptions.public.networkLost.popup.msg3': 'Use the Local Repositoy option.', + 'installer.step1.selectUseRepoOptions.public.networkLost.popup.msg4': 'If you do not have internet access and select this option, you will fail the Repository Base URL validation.', 'installer.step1.selectUseRepoOptions.public.select':'Select Version', 'installer.step1.selectUseRepoOptions.local':'Use Local Repository', 'installer.step1.usePublicRepo.ReposList.empty':'No other versions', http://git-wip-us.apache.org/repos/asf/ambari/blob/237715f0/ambari-web/app/templates/wizard/step1.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step1.hbs b/ambari-web/app/templates/wizard/step1.hbs index 72a2099..4eaef8e 100644 --- a/ambari-web/app/templates/wizard/step1.hbs +++ b/ambari-web/app/templates/wizard/step1.hbs @@ -76,7 +76,7 @@ {{! left tabs end }} {{! Public Repository radio }} - <label {{bindAttr class=":radio :big-radio :public-radio networkIssuesExist:disabled"}}> + <label {{bindAttr class=":radio :big-radio :public-radio"}}> {{view view.usePublicRepoRadioButton}} {{t installer.step1.selectUseRepoOptions.public}} {{#if networkIssuesExist}} <a id="public-disabled-link" {{action "openPublicOptionDisabledWindow" target="view"}}>{{t installer.step1.selectUseRepoOptions.public.networkLost}}</a> http://git-wip-us.apache.org/repos/asf/ambari/blob/237715f0/ambari-web/app/templates/wizard/step1/public_option_disabled_window_body.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step1/public_option_disabled_window_body.hbs b/ambari-web/app/templates/wizard/step1/public_option_disabled_window_body.hbs index 25cf49f..d7d5be5 100644 --- a/ambari-web/app/templates/wizard/step1/public_option_disabled_window_body.hbs +++ b/ambari-web/app/templates/wizard/step1/public_option_disabled_window_body.hbs @@ -22,4 +22,5 @@ <li class="public-disabled-option">{{t installer.step1.selectUseRepoOptions.public.networkLost.popup.msg1}}</li> <li class="public-disabled-option">{{t installer.step1.selectUseRepoOptions.public.networkLost.popup.msg2}}</li> <li class="public-disabled-option">{{t installer.step1.selectUseRepoOptions.public.networkLost.popup.msg3}}</li> -</ul> \ No newline at end of file +</ul> +<div class="public-disabled-message">{{t installer.step1.selectUseRepoOptions.public.networkLost.popup.msg4}}</div> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/237715f0/ambari-web/app/views/wizard/step1_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/step1_view.js b/ambari-web/app/views/wizard/step1_view.js index 503d5ef..efdae76 100644 --- a/ambari-web/app/views/wizard/step1_view.js +++ b/ambari-web/app/views/wizard/step1_view.js @@ -89,7 +89,6 @@ App.WizardStep1View = Em.View.extend({ classNames: [''], checked: Em.computed.alias('controller.selectedStack.usePublicRepo'), type: 'radio', - disabled: Em.computed.alias('controller.networkIssuesExist'), click: function () { this.get('controller').usePublicRepo();
